diff options
| author |   Veaceslav Falico <vfalico@redhat.com> | 2014-02-18 07:48:43 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2014-02-18 16:47:15 -0500 |
| commit | 9f242738376dfcf5d73c47de061a8dc301d653d1 (patch) | |
| tree | ca1105a73844ba71e54bf4beb500d7378c86b73f /drivers | |
| parent | bonding: use the new options to correctly set last_arp_rx (diff) | |
| download | linux-dev-9f242738376dfcf5d73c47de061a8dc301d653d1.tar.xz linux-dev-9f242738376dfcf5d73c47de061a8dc301d653d1.zip | |
bonding: use last_arp_rx in slave_last_rx()
Now that last_arp_rx really has the last time we've received any (validated or
not) ARP, we can use it in slave_last_rx() 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/bonding.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h index ab2e651d7bc3..ae20c5a9d00d 100644 --- a/drivers/net/bonding/bonding.h +++ b/drivers/net/bonding/bonding.h @@ -379,14 +379,10 @@ static inline unsigned long slave_oldest_target_arp_rx(struct bonding *bond, static inline unsigned long slave_last_rx(struct bonding *bond, struct slave *slave) { - if (slave_do_arp_validate(bond, slave)) { - if (bond->params.arp_all_targets == BOND_ARP_TARGETS_ALL) - return slave_oldest_target_arp_rx(bond, slave); - else - return slave->last_arp_rx; - } + if (bond->params.arp_all_targets == BOND_ARP_TARGETS_ALL) + return slave_oldest_target_arp_rx(bond, slave); - return slave->dev->last_rx; + return slave->last_arp_rx; } #ifdef CONFIG_NET_POLL_CONTROLLER |