From da5344b1c43c12d667237bc30fedc5d00fbfaa04 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Fri, 2 Dec 2011 14:27:11 -0500
Subject: [PATCH] --- yaml --- r: 278328 b: refs/heads/master c:
 340e8dc1fb4032b6c8334c9bff20b2aec42ecfd8 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 83b4dbf5cd78..ea795711c965 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b3613118eb30a589d971e4eccbbb2a1314f5dfd4
+refs/heads/master: 340e8dc1fb4032b6c8334c9bff20b2aec42ecfd8
diff --git a/trunk/net/atm/clip.c b/trunk/net/atm/clip.c
index f3b36154b0c5..c84ce7fe3f9b 100644
--- a/trunk/net/atm/clip.c
+++ b/trunk/net/atm/clip.c
@@ -340,15 +340,6 @@ static netdev_tx_t clip_start_xmit(struct sk_buff *skb,
 	}
 	n = dst_get_neighbour(dst);
 	if (!n) {
-#if 0
-		n = clip_find_neighbour(skb_dst(skb), 1);
-		if (!n) {
-			dev_kfree_skb(skb);	/* lost that one */
-			dev->stats.tx_dropped++;
-			return 0;
-		}
-		dst_set_neighbour(dst, n);
-#endif
 		pr_err("NO NEIGHBOUR !\n");
 		dev_kfree_skb(skb);
 		dev->stats.tx_dropped++;