Browse Source

bonding: Fix alb mode to only use first level vlans.

ALB/TLB learning packets use all vlans configured on top
of the bond.  This ends up being incorrect if we have a stack
of vlans on top of the bond.  ALB/TLB should only use
first level/outer most vlans in its announcements.

Signed-off-by: Vlad Yasevich <vyasevic@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Vlad Yasevich 11 years ago
parent
commit
f60c3704e8
1 changed files with 1 additions and 1 deletions
  1. 1 1
      drivers/net/bonding/bond_alb.c

+ 1 - 1
drivers/net/bonding/bond_alb.c

@@ -1045,7 +1045,7 @@ static void alb_send_learning_packets(struct slave *slave, u8 mac_addr[])
 	/* loop through vlans and send one packet for each */
 	/* loop through vlans and send one packet for each */
 	rcu_read_lock();
 	rcu_read_lock();
 	netdev_for_each_all_upper_dev_rcu(bond->dev, upper, iter) {
 	netdev_for_each_all_upper_dev_rcu(bond->dev, upper, iter) {
-		if (upper->priv_flags & IFF_802_1Q_VLAN)
+		if (is_vlan_dev(upper) && vlan_get_encap_level(upper) == 0)
 			alb_send_lp_vid(slave, mac_addr,
 			alb_send_lp_vid(slave, mac_addr,
 					vlan_dev_vlan_id(upper));
 					vlan_dev_vlan_id(upper));
 	}
 	}