diff options
| author | Jeff Garzik <jgarzik@pretzel.yyz.us> | 2005-06-26 17:11:03 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-26 17:11:03 -0400 |
| commit | 8b0ee07e108b2eefdab5bb73f33223f18926c3b2 (patch) | |
| tree | f68ca04180c5488301a40ec212ef2eb2467cf56c /drivers/net/bonding | |
| parent | 4638aef40ba9ebb9734caeed1f373c24015259fd (diff) | |
| parent | 8678887e7fb43cd6c9be6c9807b05e77848e0920 (diff) | |
Merge upstream (approx. 2.6.12-git8) into 'janitor' branch of netdev-2.6.
Diffstat (limited to 'drivers/net/bonding')
| -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 770e28f98fd5..269a5e407349 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) | |||
| 3037 | bond_set_slave_inactive_flags(bond->current_arp_slave); | 3037 | bond_set_slave_inactive_flags(bond->current_arp_slave); |
| 3038 | 3038 | ||
| 3039 | /* search for next candidate */ | 3039 | /* search for next candidate */ |
| 3040 | bond_for_each_slave_from(bond, slave, i, bond->current_arp_slave) { | 3040 | bond_for_each_slave_from(bond, slave, i, bond->current_arp_slave->next) { |
| 3041 | if (IS_UP(slave->dev)) { | 3041 | if (IS_UP(slave->dev)) { |
| 3042 | slave->link = BOND_LINK_BACK; | 3042 | slave->link = BOND_LINK_BACK; |
| 3043 | bond_set_slave_active_flags(slave); | 3043 | bond_set_slave_active_flags(slave); |