diff options
author | Pavel Emelyanov <xemul@openvz.org> | 2008-07-16 23:31:16 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-07-16 23:31:16 -0400 |
commit | de0744af1fe2d0a3d428f6af0f2fe1f6179b1a9c (patch) | |
tree | 68d02820b1aa13e8fa9743c0ece5930a13d5a205 /net/dccp | |
parent | 4e6734447dbc7a0a85e09616821c0782d9fb1141 (diff) |
mib: add net to NET_INC_STATS_BH
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dccp')
-rw-r--r-- | net/dccp/ipv4.c | 10 | ||||
-rw-r--r-- | net/dccp/ipv6.c | 8 | ||||
-rw-r--r-- | net/dccp/timer.c | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c index 9f760a1e312c..2622ace17c46 100644 --- a/net/dccp/ipv4.c +++ b/net/dccp/ipv4.c | |||
@@ -230,7 +230,7 @@ static void dccp_v4_err(struct sk_buff *skb, u32 info) | |||
230 | * servers this needs to be solved differently. | 230 | * servers this needs to be solved differently. |
231 | */ | 231 | */ |
232 | if (sock_owned_by_user(sk)) | 232 | if (sock_owned_by_user(sk)) |
233 | NET_INC_STATS_BH(LINUX_MIB_LOCKDROPPEDICMPS); | 233 | NET_INC_STATS_BH(net, LINUX_MIB_LOCKDROPPEDICMPS); |
234 | 234 | ||
235 | if (sk->sk_state == DCCP_CLOSED) | 235 | if (sk->sk_state == DCCP_CLOSED) |
236 | goto out; | 236 | goto out; |
@@ -239,7 +239,7 @@ static void dccp_v4_err(struct sk_buff *skb, u32 info) | |||
239 | seq = dccp_hdr_seq(dh); | 239 | seq = dccp_hdr_seq(dh); |
240 | if ((1 << sk->sk_state) & ~(DCCPF_REQUESTING | DCCPF_LISTEN) && | 240 | if ((1 << sk->sk_state) & ~(DCCPF_REQUESTING | DCCPF_LISTEN) && |
241 | !between48(seq, dp->dccps_swl, dp->dccps_swh)) { | 241 | !between48(seq, dp->dccps_swl, dp->dccps_swh)) { |
242 | NET_INC_STATS_BH(LINUX_MIB_OUTOFWINDOWICMPS); | 242 | NET_INC_STATS_BH(net, LINUX_MIB_OUTOFWINDOWICMPS); |
243 | goto out; | 243 | goto out; |
244 | } | 244 | } |
245 | 245 | ||
@@ -286,7 +286,7 @@ static void dccp_v4_err(struct sk_buff *skb, u32 info) | |||
286 | BUG_TRAP(!req->sk); | 286 | BUG_TRAP(!req->sk); |
287 | 287 | ||
288 | if (seq != dccp_rsk(req)->dreq_iss) { | 288 | if (seq != dccp_rsk(req)->dreq_iss) { |
289 | NET_INC_STATS_BH(LINUX_MIB_OUTOFWINDOWICMPS); | 289 | NET_INC_STATS_BH(net, LINUX_MIB_OUTOFWINDOWICMPS); |
290 | goto out; | 290 | goto out; |
291 | } | 291 | } |
292 | /* | 292 | /* |
@@ -409,9 +409,9 @@ struct sock *dccp_v4_request_recv_sock(struct sock *sk, struct sk_buff *skb, | |||
409 | return newsk; | 409 | return newsk; |
410 | 410 | ||
411 | exit_overflow: | 411 | exit_overflow: |
412 | NET_INC_STATS_BH(LINUX_MIB_LISTENOVERFLOWS); | 412 | NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_LISTENOVERFLOWS); |
413 | exit: | 413 | exit: |
414 | NET_INC_STATS_BH(LINUX_MIB_LISTENDROPS); | 414 | NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_LISTENDROPS); |
415 | dst_release(dst); | 415 | dst_release(dst); |
416 | return NULL; | 416 | return NULL; |
417 | } | 417 | } |
diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c index 83cc9bbc6208..b74e8b2cbe55 100644 --- a/net/dccp/ipv6.c +++ b/net/dccp/ipv6.c | |||
@@ -111,7 +111,7 @@ static void dccp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, | |||
111 | 111 | ||
112 | bh_lock_sock(sk); | 112 | bh_lock_sock(sk); |
113 | if (sock_owned_by_user(sk)) | 113 | if (sock_owned_by_user(sk)) |
114 | NET_INC_STATS_BH(LINUX_MIB_LOCKDROPPEDICMPS); | 114 | NET_INC_STATS_BH(net, LINUX_MIB_LOCKDROPPEDICMPS); |
115 | 115 | ||
116 | if (sk->sk_state == DCCP_CLOSED) | 116 | if (sk->sk_state == DCCP_CLOSED) |
117 | goto out; | 117 | goto out; |
@@ -189,7 +189,7 @@ static void dccp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, | |||
189 | BUG_TRAP(req->sk == NULL); | 189 | BUG_TRAP(req->sk == NULL); |
190 | 190 | ||
191 | if (seq != dccp_rsk(req)->dreq_iss) { | 191 | if (seq != dccp_rsk(req)->dreq_iss) { |
192 | NET_INC_STATS_BH(LINUX_MIB_OUTOFWINDOWICMPS); | 192 | NET_INC_STATS_BH(net, LINUX_MIB_OUTOFWINDOWICMPS); |
193 | goto out; | 193 | goto out; |
194 | } | 194 | } |
195 | 195 | ||
@@ -630,9 +630,9 @@ static struct sock *dccp_v6_request_recv_sock(struct sock *sk, | |||
630 | return newsk; | 630 | return newsk; |
631 | 631 | ||
632 | out_overflow: | 632 | out_overflow: |
633 | NET_INC_STATS_BH(LINUX_MIB_LISTENOVERFLOWS); | 633 | NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_LISTENOVERFLOWS); |
634 | out: | 634 | out: |
635 | NET_INC_STATS_BH(LINUX_MIB_LISTENDROPS); | 635 | NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_LISTENDROPS); |
636 | if (opt != NULL && opt != np->opt) | 636 | if (opt != NULL && opt != np->opt) |
637 | sock_kfree_s(sk, opt, opt->tot_len); | 637 | sock_kfree_s(sk, opt, opt->tot_len); |
638 | dst_release(dst); | 638 | dst_release(dst); |
diff --git a/net/dccp/timer.c b/net/dccp/timer.c index 8703a792b560..3608d5342ca2 100644 --- a/net/dccp/timer.c +++ b/net/dccp/timer.c | |||
@@ -224,7 +224,7 @@ static void dccp_delack_timer(unsigned long data) | |||
224 | if (sock_owned_by_user(sk)) { | 224 | if (sock_owned_by_user(sk)) { |
225 | /* Try again later. */ | 225 | /* Try again later. */ |
226 | icsk->icsk_ack.blocked = 1; | 226 | icsk->icsk_ack.blocked = 1; |
227 | NET_INC_STATS_BH(LINUX_MIB_DELAYEDACKLOCKED); | 227 | NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_DELAYEDACKLOCKED); |
228 | sk_reset_timer(sk, &icsk->icsk_delack_timer, | 228 | sk_reset_timer(sk, &icsk->icsk_delack_timer, |
229 | jiffies + TCP_DELACK_MIN); | 229 | jiffies + TCP_DELACK_MIN); |
230 | goto out; | 230 | goto out; |
@@ -254,7 +254,7 @@ static void dccp_delack_timer(unsigned long data) | |||
254 | icsk->icsk_ack.ato = TCP_ATO_MIN; | 254 | icsk->icsk_ack.ato = TCP_ATO_MIN; |
255 | } | 255 | } |
256 | dccp_send_ack(sk); | 256 | dccp_send_ack(sk); |
257 | NET_INC_STATS_BH(LINUX_MIB_DELAYEDACKS); | 257 | NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_DELAYEDACKS); |
258 | } | 258 | } |
259 | out: | 259 | out: |
260 | bh_unlock_sock(sk); | 260 | bh_unlock_sock(sk); |