diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-02 00:35:16 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-02 00:35:16 -0500 |
| commit | aa4abc9bcce0d2a7ec189e897f8f8c58ca04643b (patch) | |
| tree | 22ef88d84a2e06380bb6a853c3ba28657e4e5f92 /net/ipv6 | |
| parent | 814c01dc7c533033b4e99981a2e24a6195bfb43c (diff) | |
| parent | 52c0326beaa3cb0049d0f1c51c6ad5d4a04e4430 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-tx.c
net/8021q/vlan_core.c
net/core/dev.c
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/inet6_hashtables.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/inet6_hashtables.c b/net/ipv6/inet6_hashtables.c index 8fe267feb81e..1bcc3431859e 100644 --- a/net/ipv6/inet6_hashtables.c +++ b/net/ipv6/inet6_hashtables.c | |||
| @@ -258,11 +258,11 @@ unique: | |||
| 258 | 258 | ||
| 259 | if (twp != NULL) { | 259 | if (twp != NULL) { |
| 260 | *twp = tw; | 260 | *twp = tw; |
| 261 | NET_INC_STATS_BH(twsk_net(tw), LINUX_MIB_TIMEWAITRECYCLED); | 261 | NET_INC_STATS_BH(net, LINUX_MIB_TIMEWAITRECYCLED); |
| 262 | } else if (tw != NULL) { | 262 | } else if (tw != NULL) { |
| 263 | /* Silly. Should hash-dance instead... */ | 263 | /* Silly. Should hash-dance instead... */ |
| 264 | inet_twsk_deschedule(tw, death_row); | 264 | inet_twsk_deschedule(tw, death_row); |
| 265 | NET_INC_STATS_BH(twsk_net(tw), LINUX_MIB_TIMEWAITRECYCLED); | 265 | NET_INC_STATS_BH(net, LINUX_MIB_TIMEWAITRECYCLED); |
| 266 | 266 | ||
| 267 | inet_twsk_put(tw); | 267 | inet_twsk_put(tw); |
| 268 | } | 268 | } |