[v4,net-next,3/6] bonding: don't validate arp if we don't have to

Message ID 1372067374-10459-4-git-send-email-vfalico@redhat.com
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Veaceslav Falico June 24, 2013, 9:49 a.m.
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>
 drivers/net/bonding/bond_main.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)


diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 1645130..7fe9802 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,
+	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",