diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-03 21:05:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-03 21:05:43 -0700 |
| commit | 6dbbd92522a13bcd5003829cbed30bc38a3d0362 (patch) | |
| tree | b486642d7392b81d89f159d65fd556a432e78d16 /net/core/neighbour.c | |
| parent | d6748066ad0e8b2514545998f8367ebb3906f299 (diff) | |
| parent | e1cfb67acd5e890bbad695000d2c997bfb7f1756 (diff) | |
| download | linux-3.10-6dbbd92522a13bcd5003829cbed30bc38a3d0362.tar.gz linux-3.10-6dbbd92522a13bcd5003829cbed30bc38a3d0362.tar.bz2 linux-3.10-6dbbd92522a13bcd5003829cbed30bc38a3d0362.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (45 commits)
be2net: Add detect UE feature for Lancer
be2net: Prevent CQ full condition for Lancer
be2net: Fix disabling multicast promiscous mode
be2net: Fix endian issue in RX filter command
af_packet: de-inline some helper functions
MAINTAINERS: Add can-gw include to maintained files
net: Add back alignment for size for __alloc_skb
net: add missing bh_unlock_sock() calls
l2tp: fix race in l2tp_recv_dequeue()
ixgbevf: Update release version
ixgbe: DCB, return max for IEEE traffic classes
ixgbe: fix reading of the buffer returned by the firmware
ixgbe: Fix compiler warnings
ixgbe: fix smatch splat due to missing NULL check
ixgbe: fix disabling of Tx laser at probe
ixgbe: Fix link issues caused by a reset while interface is down
igb: Fix for I347AT4 PHY cable length unit detection
e100: make sure vlan support isn't advertised on old adapters
e1000e: demote a debugging WARN to a debug log message
net: fix typo in drivers/net/ethernet/xilinx/ll_temac_main.c
...
Diffstat (limited to 'net/core/neighbour.c')
| -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 909ecb3c2a3..039d51e6c28 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, |