diff --git a/[refs] b/[refs] index b5e5a5237396..ed98b8b7c16a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 59ed6eecff4aa00c5c5d18ffd180acac108d596e +refs/heads/master: f8a68e752bc4e39644843403168137663c984524 diff --git a/trunk/net/ipv4/arp.c b/trunk/net/ipv4/arp.c index 8a3881e28aca..c29d75d8f1b1 100644 --- a/trunk/net/ipv4/arp.c +++ b/trunk/net/ipv4/arp.c @@ -801,11 +801,8 @@ static int arp_process(struct sk_buff *skb) * cache. */ - /* - * Special case: IPv4 duplicate address detection packet (RFC2131) - * and Gratuitous ARP/ARP Announce. (RFC3927, Section 2.4) - */ - if (sip == 0 || tip == sip) { + /* Special case: IPv4 duplicate address detection packet (RFC2131) */ + if (sip == 0) { if (arp->ar_op == htons(ARPOP_REQUEST) && inet_addr_type(net, tip) == RTN_LOCAL && !arp_ignore(in_dev, sip, tip))