From 250ff613d461bcaec48691d5d17cf420f332af56 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Fri, 20 Jul 2012 16:00:53 -0700
Subject: [PATCH] --- yaml --- r: 315743 b: refs/heads/master c:
 0bb4087cbec0ef74fd416789d6aad67957063057 h: refs/heads/master i:   315741:
 f1e16267a884bb5b2895e6ca089d42e03f6cd5c5   315739:
 4904ea3f465b904753c4a4ff5f3381be412d1902   315735:
 b94dcdbb4ee52ffed9454712ddca91162d346ac6   315727:
 0b6ca166ecb074c29a316240713ac903c626c0ef   315711:
 e78ad9f74bba0db1b9333a61fb369adb4711a139 v: v3

---
 [refs]                  | 2 +-
 trunk/include/net/arp.h | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

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;