From d903adff98672c414982c4d8444115e2c418903f Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Tue, 1 Nov 2011 17:45:55 -0400
Subject: [PATCH] --- yaml --- r: 273509 b: refs/heads/master c:
 045f7b3b0005bf30ad8d664c7651d816e2650cd2 h: refs/heads/master i:   273507:
 120681c926f0dc36980561a95af3d4a019840cea v: v3

---
 [refs]                     | 2 +-
 trunk/net/core/neighbour.c | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 65a5a55f4fd7..ad4bfd9c2fe3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 563e12326473cb5d6cce0a4dca32509fe753eb8d
+refs/heads/master: 045f7b3b0005bf30ad8d664c7651d816e2650cd2
diff --git a/trunk/net/core/neighbour.c b/trunk/net/core/neighbour.c
index 909ecb3c2a33..039d51e6c284 100644
--- a/trunk/net/core/neighbour.c
+++ b/trunk/net/core/neighbour.c
@@ -872,12 +872,8 @@ static void neigh_timer_handler(unsigned long arg)
 	now = jiffies;
 	next = now + HZ;
 
-	if (!(state & NUD_IN_TIMER)) {
-#ifndef CONFIG_SMP
-		printk(KERN_WARNING "neigh: timer & !nud_in_timer\n");
-#endif
+	if (!(state & NUD_IN_TIMER))
 		goto out;
-	}
 
 	if (state & NUD_REACHABLE) {
 		if (time_before_eq(now,