---

yaml --- r: 315743 b: refs/heads/master c: 0bb4087 h: refs/heads/master i: 315741: f1e1626 315739: 4904ea3 315735: b94dcdb 315727: 0b6ca16 315711: e78ad9f v: v3
git-mirror · Jul 20, 2012 · 250ff61 · 250ff61
1 parent 9f8a715
commit 250ff61
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git 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
@@ -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;