Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[firefly-linux-kernel-4.4.55.git] / include / net / arp.h

diff --git a/include/net/arp.h b/include/net/arp.h
index 4617d9841132751721c56a800792a70fa0520fb8..7f7df93f37cd0d3b3259775ebf6ab23743b3c564 100644 (file)
--- a/include/net/arp.h
+++ b/include/net/arp.h
@@ -21,9 +21,6 @@ static inline struct neighbour *__ipv4_neigh_lookup_noref(struct net_device *dev
        struct neighbour *n;
        u32 hash_val;
 
-       if (dev->flags & (IFF_LOOPBACK | IFF_POINTOPOINT))
-               key = 0;
-
        hash_val = arp_hashfn(key, dev, nht->hash_rnd[0]) >> (32 - nht->hash_shift);
        for (n = rcu_dereference_bh(nht->hash_buckets[hash_val]);
             n != NULL;