Skip to content

Commit

Permalink
bonding: don't validate arp if we don't have to
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Veaceslav Falico authored and David S. Miller committed Jun 25, 2013
1 parent 0afee4e commit 2c14610
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions drivers/net/bonding/bond_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 2c14610

Please sign in to comment.