summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzheng.li <zheng.x.li@oracle.com>2014-04-02 11:01:48 +0800
committerDavid S. Miller <davem@davemloft.net>2014-04-04 10:02:20 -0400
commit7db8df02797e29cfa7d62a7e0b19f41e64b8433e (patch)
tree55a8e38354e38374eefcf503935a079137272432
parente33d0ba8047b049c9262fdb1fcafb93cb52ceceb (diff)
downloadlinux-7db8df02797e29cfa7d62a7e0b19f41e64b8433e.tar.gz
linux-7db8df02797e29cfa7d62a7e0b19f41e64b8433e.tar.bz2
linux-7db8df02797e29cfa7d62a7e0b19f41e64b8433e.zip
bonding: Inactive slaves should keep inactive flag's value
bond_open is not setting the inactive flag correctly for some modes (alb and tlb), resulting in error behavior if the bond has been administratively set down and then back up. This effect should not occur when slaves are added while the bond is up; it's something that only happens after a down/up bounce of the bond. For example, in bond tlb or alb mode, domu send some ARP request which go out from dom0 bond's active slave, then the ARP broadcast request packets go back to inactive slave from switch, because the inactive slave's inactive flag is zero, kernel will receive the packets and pass them to bridge that cause dom0's bridge map domu's MAC address to port of bond, bridge should map domu's MAC to port of vif. Signed-off-by: Zheng Li <zheng.x.li@oracle.com> Signed-off-by: Jay Vosburgh <j.vosburgh@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/bonding/bond_main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 95a6ca7d9e51..d9f85464b362 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -3077,7 +3077,7 @@ static int bond_open(struct net_device *bond_dev)
if (bond_has_slaves(bond)) {
read_lock(&bond->curr_slave_lock);
bond_for_each_slave(bond, slave, iter) {
- if ((bond->params.mode == BOND_MODE_ACTIVEBACKUP)
+ if (USES_PRIMARY(bond->params.mode)
&& (slave != bond->curr_active_slave)) {
bond_set_slave_inactive_flags(slave,
BOND_SLAVE_NOTIFY_NOW);