bianbu-repo-mirror/bianbu-linux-6.6
1
0
Fork 0
mirror of https://gitee.com/bianbu-linux/linux-6.6 synced 2025-04-24 14:07:52 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

dccp: rename DCCP_INC_STATS_BH()

Browse source 
Rename DCCP_INC_STATS_BH() to __DCCP_INC_STATS()

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric Dumazet 2016-04-27 16:44:28 -07:00 • committed by David S. Miller
parent 6aef70a851
commit aa62d76b6e
7 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
net/dccp/dccp.h
View file

@ -198,9 +198,9 @@ struct dccp_mib {
}; };
DECLARE_SNMP_STAT(struct dccp_mib, dccp_statistics); DECLARE_SNMP_STAT(struct dccp_mib, dccp_statistics);
#define DCCP_INC_STATS(field) SNMP_INC_STATS(dccp_statistics, field) #define DCCP_INC_STATS(field) SNMP_INC_STATS(dccp_statistics, field)
#define DCCP_INC_STATS_BH(field) SNMP_INC_STATS_BH(dccp_statistics, field) #define __DCCP_INC_STATS(field) SNMP_INC_STATS_BH(dccp_statistics, field)
#define DCCP_DEC_STATS(field) SNMP_DEC_STATS(dccp_statistics, field) #define DCCP_DEC_STATS(field) SNMP_DEC_STATS(dccp_statistics, field)
/* /*
* Checksumming routines * Checksumming routines

2
net/dccp/input.c
View file

@ -359,7 +359,7 @@ send_sync:
goto discard; goto discard;
} }
DCCP_INC_STATS_BH(DCCP_MIB_INERRS); __DCCP_INC_STATS(DCCP_MIB_INERRS);
discard: discard:
__kfree_skb(skb); __kfree_skb(skb);
return 0; return 0;

8
net/dccp/ipv4.c
View file

@ -318,7 +318,7 @@ static void dccp_v4_err(struct sk_buff *skb, u32 info)
case DCCP_REQUESTING: case DCCP_REQUESTING:
case DCCP_RESPOND: case DCCP_RESPOND:
if (!sock_owned_by_user(sk)) { if (!sock_owned_by_user(sk)) {
DCCP_INC_STATS_BH(DCCP_MIB_ATTEMPTFAILS); __DCCP_INC_STATS(DCCP_MIB_ATTEMPTFAILS);
sk->sk_err = err; sk->sk_err = err;
sk->sk_error_report(sk); sk->sk_error_report(sk);
@ -533,8 +533,8 @@ static void dccp_v4_ctl_send_reset(const struct sock *sk, struct sk_buff *rxskb)
bh_unlock_sock(ctl_sk); bh_unlock_sock(ctl_sk);
if (net_xmit_eval(err) == 0) { if (net_xmit_eval(err) == 0) {
DCCP_INC_STATS_BH(DCCP_MIB_OUTSEGS); __DCCP_INC_STATS(DCCP_MIB_OUTSEGS);
DCCP_INC_STATS_BH(DCCP_MIB_OUTRSTS); __DCCP_INC_STATS(DCCP_MIB_OUTRSTS);
} }
out: out:
dst_release(dst); dst_release(dst);
@ -637,7 +637,7 @@ int dccp_v4_conn_request(struct sock *sk, struct sk_buff *skb)
drop_and_free: drop_and_free:
reqsk_free(req); reqsk_free(req);
drop: drop:
DCCP_INC_STATS_BH(DCCP_MIB_ATTEMPTFAILS); __DCCP_INC_STATS(DCCP_MIB_ATTEMPTFAILS);
return -1; return -1;
} }
EXPORT_SYMBOL_GPL(dccp_v4_conn_request); EXPORT_SYMBOL_GPL(dccp_v4_conn_request);

8
net/dccp/ipv6.c
View file

@ -156,7 +156,7 @@ static void dccp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
case DCCP_RESPOND: /* Cannot happen. case DCCP_RESPOND: /* Cannot happen.
It can, it SYNs are crossed. --ANK */ It can, it SYNs are crossed. --ANK */
if (!sock_owned_by_user(sk)) { if (!sock_owned_by_user(sk)) {
DCCP_INC_STATS_BH(DCCP_MIB_ATTEMPTFAILS); __DCCP_INC_STATS(DCCP_MIB_ATTEMPTFAILS);
sk->sk_err = err; sk->sk_err = err;
/* /*
* Wake people up to see the error * Wake people up to see the error
@ -277,8 +277,8 @@ static void dccp_v6_ctl_send_reset(const struct sock *sk, struct sk_buff *rxskb)
if (!IS_ERR(dst)) { if (!IS_ERR(dst)) {
skb_dst_set(skb, dst); skb_dst_set(skb, dst);
ip6_xmit(ctl_sk, skb, &fl6, NULL, 0); ip6_xmit(ctl_sk, skb, &fl6, NULL, 0);
DCCP_INC_STATS_BH(DCCP_MIB_OUTSEGS); __DCCP_INC_STATS(DCCP_MIB_OUTSEGS);
DCCP_INC_STATS_BH(DCCP_MIB_OUTRSTS); __DCCP_INC_STATS(DCCP_MIB_OUTRSTS);
return; return;
} }
@ -378,7 +378,7 @@ static int dccp_v6_conn_request(struct sock *sk, struct sk_buff *skb)
drop_and_free: drop_and_free:
reqsk_free(req); reqsk_free(req);
drop: drop:
DCCP_INC_STATS_BH(DCCP_MIB_ATTEMPTFAILS); __DCCP_INC_STATS(DCCP_MIB_ATTEMPTFAILS);
return -1; return -1;
} }

2
net/dccp/minisocks.c
View file

@ -127,7 +127,7 @@ struct sock *dccp_create_openreq_child(const struct sock *sk,
} }
dccp_init_xmit_timers(newsk); dccp_init_xmit_timers(newsk);
DCCP_INC_STATS_BH(DCCP_MIB_PASSIVEOPENS); __DCCP_INC_STATS(DCCP_MIB_PASSIVEOPENS);
} }
return newsk; return newsk;
} }

2
net/dccp/options.c
View file

@ -253,7 +253,7 @@ out_nonsensical_length:
return 0; return 0;
out_invalid_option: out_invalid_option:
DCCP_INC_STATS_BH(DCCP_MIB_INVALIDOPT); __DCCP_INC_STATS(DCCP_MIB_INVALIDOPT);
rc = DCCP_RESET_CODE_OPTION_ERROR; rc = DCCP_RESET_CODE_OPTION_ERROR;
out_featneg_failed: out_featneg_failed:
DCCP_WARN("DCCP(%p): Option %d (len=%d) error=%u\n", sk, opt, len, rc); DCCP_WARN("DCCP(%p): Option %d (len=%d) error=%u\n", sk, opt, len, rc);

4
net/dccp/timer.c
View file

@ -28,7 +28,7 @@ static void dccp_write_err(struct sock *sk)
dccp_send_reset(sk, DCCP_RESET_CODE_ABORTED); dccp_send_reset(sk, DCCP_RESET_CODE_ABORTED);
dccp_done(sk); dccp_done(sk);
DCCP_INC_STATS_BH(DCCP_MIB_ABORTONTIMEOUT); __DCCP_INC_STATS(DCCP_MIB_ABORTONTIMEOUT);
} }
/* A write timeout has occurred. Process the after effects. */ /* A write timeout has occurred. Process the after effects. */
@ -100,7 +100,7 @@ static void dccp_retransmit_timer(struct sock *sk)
* total number of retransmissions of clones of original packets. * total number of retransmissions of clones of original packets.
*/ */
if (icsk->icsk_retransmits == 0) if (icsk->icsk_retransmits == 0)
DCCP_INC_STATS_BH(DCCP_MIB_TIMEOUTS); __DCCP_INC_STATS(DCCP_MIB_TIMEOUTS);
if (dccp_retransmit_skb(sk) != 0) { if (dccp_retransmit_skb(sk) != 0) {
/* /*