From a6b7ec8597991b2a15ba4d6005e5f52df7860ec7 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Sat, 16 Jul 2011 17:36:53 -0700
Subject: [PATCH] --- yaml --- r: 256486 b: refs/heads/master c:
 0895b08adeb3f660cdff21990d0a9c2b59a919e7 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/net/core/neighbour.c | 9 ---------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 21d56bed0f86..b3b88b50b5dc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 05e3aa0949c138803185f92bd7db9be59cfca1be
+refs/heads/master: 0895b08adeb3f660cdff21990d0a9c2b59a919e7
diff --git a/trunk/net/core/neighbour.c b/trunk/net/core/neighbour.c
index 77a399f2ad03..83f9998f3347 100644
--- a/trunk/net/core/neighbour.c
+++ b/trunk/net/core/neighbour.c
@@ -689,8 +689,6 @@ static void neigh_destroy_rcu(struct rcu_head *head)
  */
 void neigh_destroy(struct neighbour *neigh)
 {
-	struct hh_cache *hh;
-
 	NEIGH_CACHE_STAT_INC(neigh->tbl, destroys);
 
 	if (!neigh->dead) {
@@ -703,13 +701,6 @@ void neigh_destroy(struct neighbour *neigh)
 	if (neigh_del_timer(neigh))
 		printk(KERN_WARNING "Impossible event.\n");
 
-	hh = &neigh->hh;
-	if (hh->hh_len) {
-		write_seqlock_bh(&hh->hh_lock);
-		hh->hh_output = neigh_blackhole;
-		write_sequnlock_bh(&hh->hh_lock);
-	}
-
 	skb_queue_purge(&neigh->arp_queue);
 
 	dev_put(neigh->dev);