neigh: Kill bogus SMP protected debugging message.
authorDavid S. Miller <davem@davemloft.net>
Tue, 1 Nov 2011 21:45:55 +0000 (17:45 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 1 Nov 2011 21:45:55 +0000 (17:45 -0400)
Whatever situations make this state legitimate when SMP
also would be legitimate when !SMP and f.e. preemption is
enabled.

This is dubious enough that we should just delete it entirely.  If we
want to add debugging for neigh timer races, better more thorough
mechanisms are needed.

Signed-off-by: David S. Miller <davem@davemloft.net>
net/core/neighbour.c

index 909ecb3c2a3344077332bfc9fb66fd7f0bfa8031..039d51e6c284e7ab655319d399b9d40060357dcf 100644 (file)
@@ -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,