From: Changli Gao <xiaosuo@gmail.com>
Date: Wed, 1 Dec 2010 20:07:31 +0000 (+0000)
Subject: net: arp: use assignment
X-Git-Tag: v2.6.38-rc1~476^2~307
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=ae9c416d686db74f67d73c1bebf1e3a7e8b3c5b5;p=~emulex%2Finfiniband.git

net: arp: use assignment

Only when dont_send is 0, arp_filter() is consulted, so we can simply
assign the return value of arp_filter() to dont_send instead.

Signed-off-by: Changli Gao <xiaosuo@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c
index 7833f17b648..10af759f263 100644
--- a/net/ipv4/arp.c
+++ b/net/ipv4/arp.c
@@ -883,7 +883,7 @@ static int arp_process(struct sk_buff *skb)
 
 			dont_send = arp_ignore(in_dev, sip, tip);
 			if (!dont_send && IN_DEV_ARPFILTER(in_dev))
-				dont_send |= arp_filter(sip, tip, dev);
+				dont_send = arp_filter(sip, tip, dev);
 			if (!dont_send) {
 				n = neigh_event_ns(&arp_tbl, sha, &sip, dev);
 				if (n) {