summaryrefslogtreecommitdiffstats
path: root/net/ipv4/arp.c
diff options
context:
space:
mode:
authorChangli Gao2010-12-01 21:07:31 +0100
committerDavid S. Miller2010-12-06 21:59:09 +0100
commitae9c416d686db74f67d73c1bebf1e3a7e8b3c5b5 (patch)
treee0bc7c093f164fa4b07b16fa411106b31dd9b07e /net/ipv4/arp.c
parentbe2net: Handle out of buffer completions for lancer (diff)
downloadkernel-qcow2-linux-ae9c416d686db74f67d73c1bebf1e3a7e8b3c5b5.tar.gz
kernel-qcow2-linux-ae9c416d686db74f67d73c1bebf1e3a7e8b3c5b5.tar.xz
kernel-qcow2-linux-ae9c416d686db74f67d73c1bebf1e3a7e8b3c5b5.zip
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>
Diffstat (limited to 'net/ipv4/arp.c')
-rw-r--r--net/ipv4/arp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c
index 7833f17b648a..10af759f2630 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) {