diff options
| author | David S. Miller <davem@davemloft.net> | 2011-11-01 22:45:55 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-11-01 22:45:55 +0100 |
| commit | 045f7b3b0005bf30ad8d664c7651d816e2650cd2 (patch) | |
| tree | 73caac0734d397f72cf28eb4f1f20f00ec12fed7 | |
| parent | netfilter: do not propagate nf_queue errors in nf_hook_slow (diff) | |
| download | linux-045f7b3b0005bf30ad8d664c7651d816e2650cd2.tar.xz linux-045f7b3b0005bf30ad8d664c7651d816e2650cd2.zip | |
neigh: Kill bogus SMP protected debugging message.
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>
| -rw-r--r-- | net/core/neighbour.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/net/core/neighbour.c b/net/core/neighbour.c index 909ecb3c2a33..039d51e6c284 100644 --- a/net/core/neighbour.c +++ b/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, |