diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-26 20:54:33 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-26 20:54:33 (GMT) |
| commit | 4ec5240ec367a592834385893200dd4fb369354c (patch) | |
| tree | 3ac9a34948049bff79a2b2ce49c0a3c84e35a748 /drivers/net/bonding/bond_main.c | |
| parent | f49809fe9b39e22b0f6f75c86295ce216ce3e374 (diff) | |
| parent | b6016b767397258b58163494a869f8f1199e6897 (diff) | |
| download | linux-4ec5240ec367a592834385893200dd4fb369354c.tar.xz | |
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/bonding/bond_main.c')
| -rw-r--r-- | drivers/net/bonding/bond_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 770e28f..269a5e4 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -3037,7 +3037,7 @@ static void bond_activebackup_arp_mon(struct net_device *bond_dev) bond_set_slave_inactive_flags(bond->current_arp_slave); /* search for next candidate */ - bond_for_each_slave_from(bond, slave, i, bond->current_arp_slave) { + bond_for_each_slave_from(bond, slave, i, bond->current_arp_slave->next) { if (IS_UP(slave->dev)) { slave->link = BOND_LINK_BACK; bond_set_slave_active_flags(slave); |