diff options
author | Eric Dumazet <edumazet@google.com> | 2016-04-27 19:44:39 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-04-27 22:48:24 -0400 |
commit | 02a1d6e7a6bb025a77da77012190e1efc1970f1c (patch) | |
tree | 79fdbbaa1812a45cff7148cdaca96685e2c1a287 /net/ipv6/tcp_ipv6.c | |
parent | b15084ec7d4c89000242d69b5f57b4d138bad1b9 (diff) |
net: rename NET_{ADD|INC}_STATS_BH()
Rename NET_INC_STATS_BH() to __NET_INC_STATS()
and NET_ADD_STATS_BH() to __NET_ADD_STATS()
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/tcp_ipv6.c')
-rw-r--r-- | net/ipv6/tcp_ipv6.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index 78c45c027acc..52914714b923 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c | |||
@@ -352,13 +352,13 @@ static void tcp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, | |||
352 | 352 | ||
353 | bh_lock_sock(sk); | 353 | bh_lock_sock(sk); |
354 | if (sock_owned_by_user(sk) && type != ICMPV6_PKT_TOOBIG) | 354 | if (sock_owned_by_user(sk) && type != ICMPV6_PKT_TOOBIG) |
355 | NET_INC_STATS_BH(net, LINUX_MIB_LOCKDROPPEDICMPS); | 355 | __NET_INC_STATS(net, LINUX_MIB_LOCKDROPPEDICMPS); |
356 | 356 | ||
357 | if (sk->sk_state == TCP_CLOSE) | 357 | if (sk->sk_state == TCP_CLOSE) |
358 | goto out; | 358 | goto out; |
359 | 359 | ||
360 | if (ipv6_hdr(skb)->hop_limit < inet6_sk(sk)->min_hopcount) { | 360 | if (ipv6_hdr(skb)->hop_limit < inet6_sk(sk)->min_hopcount) { |
361 | NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP); | 361 | __NET_INC_STATS(net, LINUX_MIB_TCPMINTTLDROP); |
362 | goto out; | 362 | goto out; |
363 | } | 363 | } |
364 | 364 | ||
@@ -368,7 +368,7 @@ static void tcp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, | |||
368 | snd_una = fastopen ? tcp_rsk(fastopen)->snt_isn : tp->snd_una; | 368 | snd_una = fastopen ? tcp_rsk(fastopen)->snt_isn : tp->snd_una; |
369 | if (sk->sk_state != TCP_LISTEN && | 369 | if (sk->sk_state != TCP_LISTEN && |
370 | !between(seq, snd_una, tp->snd_nxt)) { | 370 | !between(seq, snd_una, tp->snd_nxt)) { |
371 | NET_INC_STATS_BH(net, LINUX_MIB_OUTOFWINDOWICMPS); | 371 | __NET_INC_STATS(net, LINUX_MIB_OUTOFWINDOWICMPS); |
372 | goto out; | 372 | goto out; |
373 | } | 373 | } |
374 | 374 | ||
@@ -649,12 +649,12 @@ static bool tcp_v6_inbound_md5_hash(const struct sock *sk, | |||
649 | return false; | 649 | return false; |
650 | 650 | ||
651 | if (hash_expected && !hash_location) { | 651 | if (hash_expected && !hash_location) { |
652 | NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_TCPMD5NOTFOUND); | 652 | __NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPMD5NOTFOUND); |
653 | return true; | 653 | return true; |
654 | } | 654 | } |
655 | 655 | ||
656 | if (!hash_expected && hash_location) { | 656 | if (!hash_expected && hash_location) { |
657 | NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_TCPMD5UNEXPECTED); | 657 | __NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPMD5UNEXPECTED); |
658 | return true; | 658 | return true; |
659 | } | 659 | } |
660 | 660 | ||
@@ -1165,7 +1165,7 @@ static struct sock *tcp_v6_syn_recv_sock(const struct sock *sk, struct sk_buff * | |||
1165 | return newsk; | 1165 | return newsk; |
1166 | 1166 | ||
1167 | out_overflow: | 1167 | out_overflow: |
1168 | NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_LISTENOVERFLOWS); | 1168 | __NET_INC_STATS(sock_net(sk), LINUX_MIB_LISTENOVERFLOWS); |
1169 | out_nonewsk: | 1169 | out_nonewsk: |
1170 | dst_release(dst); | 1170 | dst_release(dst); |
1171 | out: | 1171 | out: |
@@ -1421,7 +1421,7 @@ process: | |||
1421 | } | 1421 | } |
1422 | } | 1422 | } |
1423 | if (hdr->hop_limit < inet6_sk(sk)->min_hopcount) { | 1423 | if (hdr->hop_limit < inet6_sk(sk)->min_hopcount) { |
1424 | NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP); | 1424 | __NET_INC_STATS(net, LINUX_MIB_TCPMINTTLDROP); |
1425 | goto discard_and_relse; | 1425 | goto discard_and_relse; |
1426 | } | 1426 | } |
1427 | 1427 | ||
@@ -1454,7 +1454,7 @@ process: | |||
1454 | } else if (unlikely(sk_add_backlog(sk, skb, | 1454 | } else if (unlikely(sk_add_backlog(sk, skb, |
1455 | sk->sk_rcvbuf + sk->sk_sndbuf))) { | 1455 | sk->sk_rcvbuf + sk->sk_sndbuf))) { |
1456 | bh_unlock_sock(sk); | 1456 | bh_unlock_sock(sk); |
1457 | NET_INC_STATS_BH(net, LINUX_MIB_TCPBACKLOGDROP); | 1457 | __NET_INC_STATS(net, LINUX_MIB_TCPBACKLOGDROP); |
1458 | goto discard_and_relse; | 1458 | goto discard_and_relse; |
1459 | } | 1459 | } |
1460 | bh_unlock_sock(sk); | 1460 | bh_unlock_sock(sk); |