diff --git a/[refs] b/[refs] index 2fff2e4cb364..4d9950258c4c 100644 --- 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 index 7833f17b648a..10af759f2630 100644 --- 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) {