mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
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 <[email protected]> Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
parent
b15084ec7d
commit
02a1d6e7a6
25 changed files with 153 additions and 149 deletions
|
|
@ -205,7 +205,7 @@ void dccp_req_err(struct sock *sk, u64 seq)
|
|||
* socket here.
|
||||
*/
|
||||
if (!between48(seq, dccp_rsk(req)->dreq_iss, dccp_rsk(req)->dreq_gss)) {
|
||||
NET_INC_STATS_BH(net, LINUX_MIB_OUTOFWINDOWICMPS);
|
||||
__NET_INC_STATS(net, LINUX_MIB_OUTOFWINDOWICMPS);
|
||||
} else {
|
||||
/*
|
||||
* Still in RESPOND, just remove it silently.
|
||||
|
|
@ -273,7 +273,7 @@ static void dccp_v4_err(struct sk_buff *skb, u32 info)
|
|||
* servers this needs to be solved differently.
|
||||
*/
|
||||
if (sock_owned_by_user(sk))
|
||||
NET_INC_STATS_BH(net, LINUX_MIB_LOCKDROPPEDICMPS);
|
||||
__NET_INC_STATS(net, LINUX_MIB_LOCKDROPPEDICMPS);
|
||||
|
||||
if (sk->sk_state == DCCP_CLOSED)
|
||||
goto out;
|
||||
|
|
@ -281,7 +281,7 @@ static void dccp_v4_err(struct sk_buff *skb, u32 info)
|
|||
dp = dccp_sk(sk);
|
||||
if ((1 << sk->sk_state) & ~(DCCPF_REQUESTING | DCCPF_LISTEN) &&
|
||||
!between48(seq, dp->dccps_awl, dp->dccps_awh)) {
|
||||
NET_INC_STATS_BH(net, LINUX_MIB_OUTOFWINDOWICMPS);
|
||||
__NET_INC_STATS(net, LINUX_MIB_OUTOFWINDOWICMPS);
|
||||
goto out;
|
||||
}
|
||||
|
||||
|
|
@ -431,11 +431,11 @@ struct sock *dccp_v4_request_recv_sock(const struct sock *sk,
|
|||
return newsk;
|
||||
|
||||
exit_overflow:
|
||||
NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_LISTENOVERFLOWS);
|
||||
__NET_INC_STATS(sock_net(sk), LINUX_MIB_LISTENOVERFLOWS);
|
||||
exit_nonewsk:
|
||||
dst_release(dst);
|
||||
exit:
|
||||
NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_LISTENDROPS);
|
||||
__NET_INC_STATS(sock_net(sk), LINUX_MIB_LISTENDROPS);
|
||||
return NULL;
|
||||
put_and_exit:
|
||||
inet_csk_prepare_forced_close(newsk);
|
||||
|
|
|
|||
|
|
@ -106,7 +106,7 @@ static void dccp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
|
|||
|
||||
bh_lock_sock(sk);
|
||||
if (sock_owned_by_user(sk))
|
||||
NET_INC_STATS_BH(net, LINUX_MIB_LOCKDROPPEDICMPS);
|
||||
__NET_INC_STATS(net, LINUX_MIB_LOCKDROPPEDICMPS);
|
||||
|
||||
if (sk->sk_state == DCCP_CLOSED)
|
||||
goto out;
|
||||
|
|
@ -114,7 +114,7 @@ static void dccp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
|
|||
dp = dccp_sk(sk);
|
||||
if ((1 << sk->sk_state) & ~(DCCPF_REQUESTING | DCCPF_LISTEN) &&
|
||||
!between48(seq, dp->dccps_awl, dp->dccps_awh)) {
|
||||
NET_INC_STATS_BH(net, LINUX_MIB_OUTOFWINDOWICMPS);
|
||||
__NET_INC_STATS(net, LINUX_MIB_OUTOFWINDOWICMPS);
|
||||
goto out;
|
||||
}
|
||||
|
||||
|
|
@ -527,11 +527,11 @@ static struct sock *dccp_v6_request_recv_sock(const struct sock *sk,
|
|||
return newsk;
|
||||
|
||||
out_overflow:
|
||||
NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_LISTENOVERFLOWS);
|
||||
__NET_INC_STATS(sock_net(sk), LINUX_MIB_LISTENOVERFLOWS);
|
||||
out_nonewsk:
|
||||
dst_release(dst);
|
||||
out:
|
||||
NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_LISTENDROPS);
|
||||
__NET_INC_STATS(sock_net(sk), LINUX_MIB_LISTENDROPS);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -179,7 +179,7 @@ static void dccp_delack_timer(unsigned long data)
|
|||
if (sock_owned_by_user(sk)) {
|
||||
/* Try again later. */
|
||||
icsk->icsk_ack.blocked = 1;
|
||||
NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_DELAYEDACKLOCKED);
|
||||
__NET_INC_STATS(sock_net(sk), LINUX_MIB_DELAYEDACKLOCKED);
|
||||
sk_reset_timer(sk, &icsk->icsk_delack_timer,
|
||||
jiffies + TCP_DELACK_MIN);
|
||||
goto out;
|
||||
|
|
@ -209,7 +209,7 @@ static void dccp_delack_timer(unsigned long data)
|
|||
icsk->icsk_ack.ato = TCP_ATO_MIN;
|
||||
}
|
||||
dccp_send_ack(sk);
|
||||
NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_DELAYEDACKS);
|
||||
__NET_INC_STATS(sock_net(sk), LINUX_MIB_DELAYEDACKS);
|
||||
}
|
||||
out:
|
||||
bh_unlock_sock(sk);
|
||||
|
|
|
|||
Loading…
Reference in a new issue