diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-17 23:41:18 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-17 23:41:18 +0400 |
| commit | 18673533256a2953ccefded52df2679de8640685 (patch) | |
| tree | c1dcb3b173cb6032d3f9721e18a11ade346e17f6 /drivers/net/bonding/bond_main.c | |
| parent | ccbfddb78c7bfdce442589ccce6d60f133251b9d (diff) | |
| parent | 9f0d3c2781baa1102108e16efbe640dd74564a7c (diff) | |
| download | linux-18673533256a2953ccefded52df2679de8640685.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Pull networking fixes from David Miller:
1) Fix regression in /proc/net/if_inet6, sometimes devices do not get
listed. From Eric Dumazet.
2) Add IPSEC networking sub-section to MAINTAINERS.
3) S390 networking fixes from Hendrik Brueckner and Stefan Raspl.
4) Fix enslavement of devices that can't do VLAN properly, from Jiri
Pirko.
5) SCTP sack handling fix from Zijie Pan.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
ipv6: addrconf: fix /proc/net/if_inet6
bnx2x: fix handling mf storage modes
qeth: fix deadlock between recovery and bonding driver
smsgiucv: reestablish IUCV path after resume
sctp: fix call to SCTP_CMD_PROCESS_SACK in sctp_cmd_interpreter()
vlan: fix bond/team enslave of vlan challenged slave/port
MAINTAINERS: Add explicit section for IPSEC networking.
Diffstat (limited to 'drivers/net/bonding/bond_main.c')
| -rw-r--r-- | drivers/net/bonding/bond_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index b721902bb6b4..b2530b002125 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -1519,7 +1519,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev) /* no need to lock since we're protected by rtnl_lock */ if (slave_dev->features & NETIF_F_VLAN_CHALLENGED) { pr_debug("%s: NETIF_F_VLAN_CHALLENGED\n", slave_dev->name); - if (bond_vlan_used(bond)) { + if (vlan_uses_dev(bond_dev)) { pr_err("%s: Error: cannot enslave VLAN challenged slave %s on VLAN enabled bond %s\n", bond_dev->name, slave_dev->name, bond_dev->name); return -EPERM; |