diff options
| author | Veaceslav Falico <vfalico@redhat.com> | 2012-04-05 03:47:43 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-27 09:51:19 -0700 |
| commit | 53288841cc5e7cb81b5980a46462d8a357bc3387 (patch) | |
| tree | b23ed9b0d8d0185ab1f2537edf80b868d2fb734b /drivers | |
| parent | 9acd6c30514c0801e94e1bb3fa4734e9e47ab560 (diff) | |
| download | kernel_samsung_smdk4412-53288841cc5e7cb81b5980a46462d8a357bc3387.zip kernel_samsung_smdk4412-53288841cc5e7cb81b5980a46462d8a357bc3387.tar.gz kernel_samsung_smdk4412-53288841cc5e7cb81b5980a46462d8a357bc3387.tar.bz2 | |
bonding: properly unset current_arp_slave on slave link up
[ Upstream commit 5a4309746cd74734daa964acb02690c22b3c8911 ]
When a slave comes up, we're unsetting the current_arp_slave without
removing active flags from it, which can lead to situations where we have
more than one slave with active flags in active-backup mode.
To avoid this situation we must remove the active flags from a slave before
removing it as a current_arp_slave.
Signed-off-by: Veaceslav Falico <vfalico@redhat.com>
Signed-off-by: Jay Vosburgh <fubar@us.ibm.com>
Signed-off-by: Andy Gospodarek <andy@greyhouse.net>
Signed-off-by: Marcelo Ricardo Leitner <mleitner@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/bonding/bond_main.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 0b65c5f..e6da842 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -3076,7 +3076,11 @@ static void bond_ab_arp_commit(struct bonding *bond, int delta_in_ticks) trans_start + delta_in_ticks)) || bond->curr_active_slave != slave) { slave->link = BOND_LINK_UP; - bond->current_arp_slave = NULL; + if (bond->current_arp_slave) { + bond_set_slave_inactive_flags( + bond->current_arp_slave); + bond->current_arp_slave = NULL; + } pr_info("%s: link status definitely up for interface %s.\n", bond->dev->name, slave->dev->name); |