---

yaml --- r: 273509 b: refs/heads/master c: 045f7b3 h: refs/heads/master i: 273507: 120681c v: v3
git-mirror · Nov 1, 2011 · d903adf · d903adf
1 parent ab0a15b
commit d903adf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git 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
@@ -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,