]> git.karo-electronics.de Git - linux-beck.git/commitdiff
net: arp: use assignment
authorChangli Gao <xiaosuo@gmail.com>
Wed, 1 Dec 2010 20:07:31 +0000 (20:07 +0000)
committerDavid S. Miller <davem@davemloft.net>
Mon, 6 Dec 2010 20:59:09 +0000 (12:59 -0800)
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>
net/ipv4/arp.c

index 7833f17b648a149b8d21e134b2eee0c6d619a97c..10af759f263049f5ca32aec06e6605e700b04fe7 100644 (file)
@@ -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) {