From: Veaceslav Falico <vfalico@redhat.com>
Date: Mon, 24 Jun 2013 09:49:31 +0000 (+0200)
Subject: bonding: don't validate arp if we don't have to
X-Git-Tag: firefly_0821_release~176^2~5751^2~118
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2c14610210978512271dd6fe21d6f55b789d9a80;p=firefly-linux-kernel-4.4.55.git

bonding: don't validate arp if we don't have to

Currently, we validate all the incoming arps if arp_validate not 0.
However, we don't have to validate backup slaves if arp_validate == active
and vice versa, so return early in bond_arp_rcv() in these cases.

It works correctly now because we verify arp_validate in slave_last_rx(),
however we're just doing useless work in bond_arp_rcv().

Signed-off-by: Veaceslav Falico <vfalico@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 1645130c0a60..7fe9802c9eec 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -2634,6 +2634,10 @@ static int bond_arp_rcv(const struct sk_buff *skb, struct bonding *bond,
 		return RX_HANDLER_ANOTHER;
 
 	read_lock(&bond->lock);
+
+	if (!slave_do_arp_validate(bond, slave))
+		goto out_unlock;
+
 	alen = arp_hdr_len(bond->dev);
 
 	pr_debug("bond_arp_rcv: bond %s skb->dev %s\n",