diff options
| author | Veaceslav Falico <vfalico@redhat.com> | 2013-08-28 23:25:14 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-08-29 16:19:43 -0400 |
| commit | 5bf94b839a44aa9d8199607c32b95832f2892ee6 (patch) | |
| tree | d986abce8a2759ed5512a9e9edf5c0fe2350282b /drivers/net/bonding | |
| parent | 7aa6498123a67001e950808ce6eb5930a4c5945f (diff) | |
| download | linux-stable-5bf94b839a44aa9d8199607c32b95832f2892ee6.tar.gz linux-stable-5bf94b839a44aa9d8199607c32b95832f2892ee6.tar.bz2 linux-stable-5bf94b839a44aa9d8199607c32b95832f2892ee6.zip | |
bonding: make alb_send_learning_packets() use upper dev list
Currently, if there are vlans on top of bond, alb_send_learning_packets()
will never send LPs from the bond itself (i.e. untagged), which might leave
untagged clients unupdated.
Also, the 'circular vlan' logic (i.e. update only MAX_LP_BURST vlans at a
time, and save the last vlan for the next update) is really suboptimal - in
case of lots of vlans it will take a lot of time to update every vlan. It
is also never called in any hot path and sends only a few small packets -
thus the optimization by itself is useless.
So remove the whole current_alb_vlan/MAX_LP_BURST logic from
alb_send_learning_packets(). Instead, we'll first send a packet untagged
and then traverse the upper dev list, sending a tagged packet for each vlan
found. Also, remove the MAX_LP_BURST define - we already don't need it.
CC: Jay Vosburgh <fubar@us.ibm.com>
CC: Andy Gospodarek <andy@greyhouse.net>
Signed-off-by: Veaceslav Falico <vfalico@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding')
| -rw-r--r-- | drivers/net/bonding/bond_alb.c | 29 | ||||
| -rw-r--r-- | drivers/net/bonding/bond_alb.h | 1 |
2 files changed, 11 insertions, 19 deletions
diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c index 3ca3c85d6f24..b6a68b4a1a09 100644 --- a/drivers/net/bonding/bond_alb.c +++ b/drivers/net/bonding/bond_alb.c @@ -1013,27 +1013,20 @@ static void alb_send_lp_vid(struct slave *slave, u8 mac_addr[], static void alb_send_learning_packets(struct slave *slave, u8 mac_addr[]) { struct bonding *bond = bond_get_bond_by_slave(slave); - u16 vlan_id; - int i; - - for (i = 0; i < MAX_LP_BURST; i++) { - vlan_id = 0; - - if (bond_vlan_used(bond)) { - struct vlan_entry *vlan; + struct net_device *upper; + struct list_head *iter; - vlan = bond_next_vlan(bond, - bond->alb_info.current_alb_vlan); - - bond->alb_info.current_alb_vlan = vlan; - if (!vlan) - continue; - - vlan_id = vlan->vlan_id; - } + /* send untagged */ + alb_send_lp_vid(slave, mac_addr, 0); - alb_send_lp_vid(slave, mac_addr, vlan_id); + /* loop through vlans and send one packet for each */ + rcu_read_lock(); + netdev_for_each_upper_dev_rcu(bond->dev, upper, iter) { + if (upper->priv_flags & IFF_802_1Q_VLAN) + alb_send_lp_vid(slave, mac_addr, + vlan_dev_vlan_id(upper)); } + rcu_read_unlock(); } static int alb_set_slave_mac_addr(struct slave *slave, u8 addr[]) diff --git a/drivers/net/bonding/bond_alb.h b/drivers/net/bonding/bond_alb.h index e7a5b8b37ea3..e13917222cd4 100644 --- a/drivers/net/bonding/bond_alb.h +++ b/drivers/net/bonding/bond_alb.h @@ -53,7 +53,6 @@ struct slave; #define TLB_NULL_INDEX 0xffffffff -#define MAX_LP_BURST 3 /* rlb defs */ #define RLB_HASH_TABLE_SIZE 256 |