summaryrefslogtreecommitdiffstats
path: root/net/caif/cfrfml.c
diff options
context:
space:
mode:
authorJay Vosburgh <fubar@us.ibm.com>2010-07-21 12:14:47 +0000
committerDavid S. Miller <davem@davemloft.net>2010-07-22 14:14:46 -0700
commitf35188faa0fbabefac476536994f4b6f3677380f (patch)
tree460c54e3d8505fd0ce42d16a1798c1f8c371d4a9 /net/caif/cfrfml.c
parent4bee1f9ac066ef0350b961eab9fedc4d0bd0a549 (diff)
downloadlinux-stable-f35188faa0fbabefac476536994f4b6f3677380f.tar.gz
linux-stable-f35188faa0fbabefac476536994f4b6f3677380f.tar.bz2
linux-stable-f35188faa0fbabefac476536994f4b6f3677380f.zip
bonding: change test for presence of VLANs
After commit ad1afb00393915a51c21b1ae8704562bf036855f ("vlan_dev: VLAN 0 should be treated as "no vlan tag" (802.1p packet)") it is now regular practice for a VLAN "add vid" for VLAN 0 to arrive prior to any VLAN registration or creation of a vlan_group. This patch updates the bonding code that tests for the presence of VLANs configured above bonding. The new logic tests for bond->vlgrp to determine if a registration has occured, instead of testing that bonding's internal vlan_list is empty. The old code would panic when vlan_list was not empty, but vlgrp was still NULL (because only an "add vid" for VLAN 0 had occured). Bonding still adds VLAN 0 to its internal list so that 802.1p frames are handled correctly on transmit when non-VLAN accelerated slaves are members of the bond. The test against bond->vlan_list remains in bond_dev_queue_xmit for this reason. Modification to the bond->vlgrp now occurs under lock (in addition to RTNL), because not all inspections of it occur under RTNL. Additionally, because 8021q will never issue a "kill vid" for VLAN 0, there is now logic in bond_uninit to release any remaining entries from vlan_list. Signed-off-by: Jay Vosburgh <fubar@us.ibm.com> Cc: Pedro Garcia <pedro.netdev@dondevamos.com> Cc: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/caif/cfrfml.c')
0 files changed, 0 insertions, 0 deletions