aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Gospodarek <andy@greyhouse.net>2011-03-14 08:05:21 -0400
committerDavid S. Miller <davem@davemloft.net>2011-03-16 15:57:53 -0400
commitceda86a108671294052cbf51660097b6534672f5 (patch)
treefd82cf21c099ba455e429bac7b8b0bbb9bd0d7ea
parentfbd5060875d25f7764fd1c3d35b83a8ed1d88d7b (diff)
bonding: enable netpoll without checking link status
Only slaves that are up should transmit netpoll frames, so there is no need to check to see if a slave is up before enabling netpoll on it. This resolves a reported failure on active-backup bonds where a slave interface is down when netpoll was enabled. Signed-off-by: Andy Gospodarek <andy@greyhouse.net> Tested-by: WANG Cong <amwang@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/bonding/bond_main.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 27c413aa15da..1a6e9eb7af43 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -1347,8 +1347,6 @@ static int bond_netpoll_setup(struct net_device *dev, struct netpoll_info *ni)
1347 1347
1348 read_lock(&bond->lock); 1348 read_lock(&bond->lock);
1349 bond_for_each_slave(bond, slave, i) { 1349 bond_for_each_slave(bond, slave, i) {
1350 if (!IS_UP(slave->dev))
1351 continue;
1352 err = slave_enable_netpoll(slave); 1350 err = slave_enable_netpoll(slave);
1353 if (err) { 1351 if (err) {
1354 __bond_netpoll_cleanup(bond); 1352 __bond_netpoll_cleanup(bond);