diff options
| author |   Veaceslav Falico <vfalico@redhat.com> | 2014-02-18 07:48:44 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2014-02-18 16:47:15 -0500 |
| commit | ff71529da40eee34458b1c3d62ca158a13e99b4d (patch) | |
| tree | 85bfc9cb8f4fc6b4f037b0dbbf2a7ab42e3ad8a4 /drivers | |
| parent | bonding: use last_arp_rx in slave_last_rx() (diff) | |
| download | linux-dev-ff71529da40eee34458b1c3d62ca158a13e99b4d.tar.xz linux-dev-ff71529da40eee34458b1c3d62ca158a13e99b4d.zip | |
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: Veaceslav Falico <vfalico@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/bonding/bond_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 3fe81cdbd8fb..e7aab9a6a670 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -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; |