Re: [PATCH net-next-2.6 1/2] bonding: change test for presence of VLANs

[David Miller <davem@davemloft.net>]

From: Jay Vosburgh <fubar@us.ibm.com>
Date: Wed, 21 Jul 2010 15:14:47 -0700

> 	After commit:
> 
> commit ad1afb00393915a51c21b1ae8704562bf036855f
> Author: Pedro Garcia <pedro.netdev@dondevamos.com>
> Date:   Sun Jul 18 15:38:44 2010 -0700
> 
>     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>

Applied.