Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 90bbcc60 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

net: tcp: rename TCP_INC_STATS_BH 



Rename TCP_INC_STATS_BH() to __TCP_INC_STATS()

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b540f9d7

include/net/tcp.h

+1 −1
Original line number Diff line number Diff line
@@ -332,7 +332,7 @@ bool tcp_check_oom(struct sock *sk, int shift); 
extern struct proto tcp_prot;



#define TCP_INC_STATS(net, field)	SNMP_INC_STATS((net)->mib.tcp_statistics, field)

#define TCP_INC_STATS_BH(net, field)	SNMP_INC_STATS_BH((net)->mib.tcp_statistics, field)

#define __TCP_INC_STATS(net, field)	SNMP_INC_STATS_BH((net)->mib.tcp_statistics, field)

#define TCP_DEC_STATS(net, field)	SNMP_DEC_STATS((net)->mib.tcp_statistics, field)

#define TCP_ADD_STATS(net, field, val)	SNMP_ADD_STATS((net)->mib.tcp_statistics, field, val)

net/ipv4/tcp.c

+1 −1
Original line number Diff line number Diff line
@@ -3091,7 +3091,7 @@ void tcp_done(struct sock *sk) 
	struct request_sock *req = tcp_sk(sk)->fastopen_rsk;



	if (sk->sk_state == TCP_SYN_SENT || sk->sk_state == TCP_SYN_RECV)

		TCP_INC_STATS_BH(sock_net(sk), TCP_MIB_ATTEMPTFAILS);

		__TCP_INC_STATS(sock_net(sk), TCP_MIB_ATTEMPTFAILS);



	tcp_set_state(sk, TCP_CLOSE);

	tcp_clear_xmit_timers(sk);

net/ipv4/tcp_input.c

+4 −4
Original line number Diff line number Diff line
@@ -5233,7 +5233,7 @@ static bool tcp_validate_incoming(struct sock *sk, struct sk_buff *skb, 
	if (th->syn) {

syn_challenge:

		if (syn_inerr)

			TCP_INC_STATS_BH(sock_net(sk), TCP_MIB_INERRS);

			__TCP_INC_STATS(sock_net(sk), TCP_MIB_INERRS);

		NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_TCPSYNCHALLENGE);

		tcp_send_challenge_ack(sk, skb);

		goto discard;
@@ -5349,7 +5349,7 @@ void tcp_rcv_established(struct sock *sk, struct sk_buff *skb, 
				tcp_data_snd_check(sk);

				return;

			} else { /* Header too small */

				TCP_INC_STATS_BH(sock_net(sk), TCP_MIB_INERRS);

				__TCP_INC_STATS(sock_net(sk), TCP_MIB_INERRS);

				goto discard;

			}

		} else {
@@ -5456,8 +5456,8 @@ void tcp_rcv_established(struct sock *sk, struct sk_buff *skb, 
	return;



csum_error:

	TCP_INC_STATS_BH(sock_net(sk), TCP_MIB_CSUMERRORS);

	TCP_INC_STATS_BH(sock_net(sk), TCP_MIB_INERRS);

	__TCP_INC_STATS(sock_net(sk), TCP_MIB_CSUMERRORS);

	__TCP_INC_STATS(sock_net(sk), TCP_MIB_INERRS);



discard:

	tcp_drop(sk, skb);

net/ipv4/tcp_ipv4.c

+8 −8
Original line number Diff line number Diff line
@@ -697,8 +697,8 @@ static void tcp_v4_send_reset(const struct sock *sk, struct sk_buff *skb) 
			      ip_hdr(skb)->saddr, ip_hdr(skb)->daddr,

			      &arg, arg.iov[0].iov_len);



	TCP_INC_STATS_BH(net, TCP_MIB_OUTSEGS);

	TCP_INC_STATS_BH(net, TCP_MIB_OUTRSTS);

	__TCP_INC_STATS(net, TCP_MIB_OUTSEGS);

	__TCP_INC_STATS(net, TCP_MIB_OUTRSTS);



#ifdef CONFIG_TCP_MD5SIG

out:
@@ -779,7 +779,7 @@ static void tcp_v4_send_ack(struct net *net, 
			      ip_hdr(skb)->saddr, ip_hdr(skb)->daddr,

			      &arg, arg.iov[0].iov_len);



	TCP_INC_STATS_BH(net, TCP_MIB_OUTSEGS);

	__TCP_INC_STATS(net, TCP_MIB_OUTSEGS);

}



static void tcp_v4_timewait_ack(struct sock *sk, struct sk_buff *skb)
@@ -1432,8 +1432,8 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb) 
	return 0;



csum_err:

	TCP_INC_STATS_BH(sock_net(sk), TCP_MIB_CSUMERRORS);

	TCP_INC_STATS_BH(sock_net(sk), TCP_MIB_INERRS);

	__TCP_INC_STATS(sock_net(sk), TCP_MIB_CSUMERRORS);

	__TCP_INC_STATS(sock_net(sk), TCP_MIB_INERRS);

	goto discard;

}

EXPORT_SYMBOL(tcp_v4_do_rcv);
@@ -1547,7 +1547,7 @@ int tcp_v4_rcv(struct sk_buff *skb) 
		goto discard_it;



	/* Count it even if it's bad */

	TCP_INC_STATS_BH(net, TCP_MIB_INSEGS);

	__TCP_INC_STATS(net, TCP_MIB_INSEGS);



	if (!pskb_may_pull(skb, sizeof(struct tcphdr)))

		goto discard_it;
@@ -1679,9 +1679,9 @@ int tcp_v4_rcv(struct sk_buff *skb) 


	if (tcp_checksum_complete(skb)) {

csum_error:

		TCP_INC_STATS_BH(net, TCP_MIB_CSUMERRORS);

		__TCP_INC_STATS(net, TCP_MIB_CSUMERRORS);

bad_packet:

		TCP_INC_STATS_BH(net, TCP_MIB_INERRS);

		__TCP_INC_STATS(net, TCP_MIB_INERRS);

	} else {

		tcp_v4_send_reset(NULL, skb);

	}

net/ipv4/tcp_minisocks.c

+2 −2
Original line number Diff line number Diff line
@@ -545,7 +545,7 @@ struct sock *tcp_create_openreq_child(const struct sock *sk, 
		newtp->rack.mstamp.v64 = 0;

		newtp->rack.advanced = 0;



		TCP_INC_STATS_BH(sock_net(sk), TCP_MIB_PASSIVEOPENS);

		__TCP_INC_STATS(sock_net(sk), TCP_MIB_PASSIVEOPENS);

	}

	return newsk;

}
@@ -729,7 +729,7 @@ struct sock *tcp_check_req(struct sock *sk, struct sk_buff *skb, 
	 *	   "fourth, check the SYN bit"

	 */

	if (flg & (TCP_FLAG_RST|TCP_FLAG_SYN)) {

		TCP_INC_STATS_BH(sock_net(sk), TCP_MIB_ATTEMPTFAILS);

		__TCP_INC_STATS(sock_net(sk), TCP_MIB_ATTEMPTFAILS);

		goto embryonic_reset;

	}