Skip to content

Commit

Permalink
bonding: use last_arp_rx in bond_loadbalance_arp_mon()
Browse files Browse the repository at this point in the history
Now that last_arp_rx correctly show the last time we've received an ARP, we
can use it safely instead of slave->dev->last_rx.

CC: Jay Vosburgh <fubar@us.ibm.com>
CC: Andy Gospodarek <andy@greyhouse.net>
Signed-off-by: Veaceslav Falico <vfalico@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Veaceslav Falico authored and David S. Miller committed Feb 18, 2014
1 parent 9f24273 commit ff71529
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/net/bonding/bond_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -2372,7 +2372,7 @@ static void bond_loadbalance_arp_mon(struct work_struct *work)

if (slave->link != BOND_LINK_UP) {
if (bond_time_in_interval(bond, trans_start, 1) &&
bond_time_in_interval(bond, slave->dev->last_rx, 1)) {
bond_time_in_interval(bond, slave->last_arp_rx, 1)) {

slave->link = BOND_LINK_UP;
slave_state_changed = 1;
Expand Down Expand Up @@ -2401,7 +2401,7 @@ static void bond_loadbalance_arp_mon(struct work_struct *work)
* if we don't know our ip yet
*/
if (!bond_time_in_interval(bond, trans_start, 2) ||
!bond_time_in_interval(bond, slave->dev->last_rx, 2)) {
!bond_time_in_interval(bond, slave->last_arp_rx, 2)) {

slave->link = BOND_LINK_DOWN;
slave_state_changed = 1;
Expand Down

0 comments on commit ff71529

Please sign in to comment.