summaryrefslogtreecommitdiffstats
path: root/drivers/net/bonding/bond_main.c
diff options
context:
space:
mode:
authorVeaceslav Falico2014-02-18 07:48:39 +0100
committerDavid S. Miller2014-02-18 22:47:14 +0100
commit3fe68df97c7f132495664358e0bfbfcd4ca7809c (patch)
tree40915f2697abda4e04bf459d5c07a5dc02e2150e /drivers/net/bonding/bond_main.c
parentbonding: always update last_arp_rx on packet recieve (diff)
downloadkernel-qcow2-linux-3fe68df97c7f132495664358e0bfbfcd4ca7809c.tar.gz
kernel-qcow2-linux-3fe68df97c7f132495664358e0bfbfcd4ca7809c.tar.xz
kernel-qcow2-linux-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_main.c')
-rw-r--r--drivers/net/bonding/bond_main.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 7747cc5c62eb..257ee7f05645 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -3059,8 +3059,7 @@ static int bond_open(struct net_device *bond_dev)
if (bond->params.arp_interval) { /* arp interval, in milliseconds. */
queue_delayed_work(bond->wq, &bond->arp_work, 0);
- if (bond->params.arp_validate)
- bond->recv_probe = bond_arp_rcv;
+ bond->recv_probe = bond_arp_rcv;
}
if (bond->params.mode == BOND_MODE_8023AD) {