diff options
author | Veaceslav Falico <vfalico@redhat.com> | 2014-02-18 07:48:39 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-02-18 16:47:14 -0500 |
commit | 3fe68df97c7f132495664358e0bfbfcd4ca7809c (patch) | |
tree | 40915f2697abda4e04bf459d5c07a5dc02e2150e /drivers/net/bonding/bond_options.c | |
parent | 6db4a54593ce12423c68155b7b59b9fbd3e6519d (diff) | |
download | lwn-3fe68df97c7f132495664358e0bfbfcd4ca7809c.tar.gz lwn-3fe68df97c7f132495664358e0bfbfcd4ca7809c.zip |
bonding: always set recv_probe to bond_arp_rcv in arp monitor
Currently we only set bond_arp_rcv() if we're using arp_validate, however
this makes us skip updating last_arp_rx if we're not validating incoming
ARPs - thus, if arp_validate is off, last_arp_rx will never be updated.
Fix this by always setting up recv_probe = bond_arp_rcv, even if we're not
using arp_validate.
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/net/bonding/bond_options.c')
-rw-r--r-- | drivers/net/bonding/bond_options.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/bonding/bond_options.c b/drivers/net/bonding/bond_options.c index 4d58645b117d..ad20c8ca11b6 100644 --- a/drivers/net/bonding/bond_options.c +++ b/drivers/net/bonding/bond_options.c @@ -810,8 +810,7 @@ int bond_option_arp_interval_set(struct bonding *bond, cancel_delayed_work_sync(&bond->arp_work); } else { /* arp_validate can be set only in active-backup mode */ - if (bond->params.arp_validate) - bond->recv_probe = bond_arp_rcv; + bond->recv_probe = bond_arp_rcv; cancel_delayed_work_sync(&bond->mii_work); queue_delayed_work(bond->wq, &bond->arp_work, 0); } |