Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff71529d authored by Veaceslav Falico's avatar Veaceslav Falico Committed by David S. Miller
Browse files

bonding: use last_arp_rx in bond_loadbalance_arp_mon() 



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: default avatarVeaceslav Falico <vfalico@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9f242738

drivers/net/bonding/bond_main.c

+2 −2
Original line number Diff line number Diff line
@@ -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;
@@ -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;