---

yaml --- r: 224804 b: refs/heads/master c: ae9c416 h: refs/heads/master v: v3
git-mirror · Dec 6, 2010 · 09e66db · 09e66db
1 parent f167eaa
commit 09e66db
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6464281161e46254ac39505ad41d21dbe7d1738f
+refs/heads/master: ae9c416d686db74f67d73c1bebf1e3a7e8b3c5b5
diff --git a/trunk/net/ipv4/arp.c b/trunk/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) {