diff --git a/[refs] b/[refs] index a71002769be8..c25b81b3a97d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fa0afcd10951afad2022dda09777d2bf70cdab3d +refs/heads/master: 0bb4087cbec0ef74fd416789d6aad67957063057 diff --git a/trunk/include/net/arp.h b/trunk/include/net/arp.h index 4617d9841132..7f7df93f37cd 100644 --- a/trunk/include/net/arp.h +++ b/trunk/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;