net: rename NET_{ADD|INC}_STATS_BH() (02a1d6e7) · Commits · e / devices / android_kernel_fairphone_FP5

include/net/ip.h

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -193,9 +193,9 @@ void ip_send_unicast_reply(struct sock sk, struct sk_buff skb,
	#define IP_UPD_PO_STATS(net, field, val) SNMP_UPD_PO_STATS64((net)->mib.ip_statistics, field, val)		#define IP_UPD_PO_STATS(net, field, val) SNMP_UPD_PO_STATS64((net)->mib.ip_statistics, field, val)
	#define __IP_UPD_PO_STATS(net, field, val) SNMP_UPD_PO_STATS64_BH((net)->mib.ip_statistics, field, val)		#define __IP_UPD_PO_STATS(net, field, val) SNMP_UPD_PO_STATS64_BH((net)->mib.ip_statistics, field, val)
	#define NET_INC_STATS(net, field) SNMP_INC_STATS((net)->mib.net_statistics, field)		#define NET_INC_STATS(net, field) SNMP_INC_STATS((net)->mib.net_statistics, field)
	#define NET_INC_STATS_BH(net, field) SNMP_INC_STATS_BH((net)->mib.net_statistics, field)		#define __NET_INC_STATS(net, field) SNMP_INC_STATS_BH((net)->mib.net_statistics, field)
	#define NET_ADD_STATS(net, field, adnd) SNMP_ADD_STATS((net)->mib.net_statistics, field, adnd)		#define NET_ADD_STATS(net, field, adnd) SNMP_ADD_STATS((net)->mib.net_statistics, field, adnd)
	#define NET_ADD_STATS_BH(net, field, adnd) SNMP_ADD_STATS_BH((net)->mib.net_statistics, field, adnd)		#define __NET_ADD_STATS(net, field, adnd) SNMP_ADD_STATS_BH((net)->mib.net_statistics, field, adnd)

	u64 snmp_get_cpu_field(void __percpu *mib, int cpu, int offct);		u64 snmp_get_cpu_field(void __percpu *mib, int cpu, int offct);
	unsigned long snmp_fold_field(void __percpu *mib, int offt);		unsigned long snmp_fold_field(void __percpu *mib, int offt);

include/net/tcp.h

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1743,7 +1743,7 @@ static inline __u32 cookie_init_sequence(const struct tcp_request_sock_ops *ops,
	__u16 *mss)		__u16 *mss)
	{		{
	tcp_synq_overflow(sk);		tcp_synq_overflow(sk);
	NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_SYNCOOKIESSENT);		__NET_INC_STATS(sock_net(sk), LINUX_MIB_SYNCOOKIESSENT);
	return ops->cookie_init_seq(skb, mss);		return ops->cookie_init_seq(skb, mss);
	}		}
	#else		#else
	@@ -1852,7 +1852,7 @@ static inline void tcp_segs_in(struct tcp_sock tp, const struct sk_buff skb)
	static inline void tcp_listendrop(const struct sock *sk)		static inline void tcp_listendrop(const struct sock *sk)
	{		{
	atomic_inc(&((struct sock *)sk)->sk_drops);		atomic_inc(&((struct sock *)sk)->sk_drops);
	NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_LISTENDROPS);		__NET_INC_STATS(sock_net(sk), LINUX_MIB_LISTENDROPS);
	}		}

	#endif /* _TCP_H */		#endif /* _TCP_H */

net/core/dev.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -4982,7 +4982,7 @@ bool sk_busy_loop(struct sock *sk, int nonblock)
	netpoll_poll_unlock(have);		netpoll_poll_unlock(have);
	}		}
	if (rc > 0)		if (rc > 0)
	NET_ADD_STATS_BH(sock_net(sk),		__NET_ADD_STATS(sock_net(sk),
	LINUX_MIB_BUSYPOLLRXPACKETS, rc);		LINUX_MIB_BUSYPOLLRXPACKETS, rc);
	local_bh_enable();		local_bh_enable();

net/dccp/ipv4.c

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -205,7 +205,7 @@ void dccp_req_err(struct sock *sk, u64 seq)
	* socket here.		* socket here.
	*/		*/
	if (!between48(seq, dccp_rsk(req)->dreq_iss, dccp_rsk(req)->dreq_gss)) {		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 {		} else {
	/*		/*
	* Still in RESPOND, just remove it silently.		* 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.		* servers this needs to be solved differently.
	*/		*/
	if (sock_owned_by_user(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)		if (sk->sk_state == DCCP_CLOSED)
	goto out;		goto out;
	@@ -281,7 +281,7 @@ static void dccp_v4_err(struct sk_buff *skb, u32 info)
	dp = dccp_sk(sk);		dp = dccp_sk(sk);
	if ((1 << sk->sk_state) & ~(DCCPF_REQUESTING \| DCCPF_LISTEN) &&		if ((1 << sk->sk_state) & ~(DCCPF_REQUESTING \| DCCPF_LISTEN) &&
	!between48(seq, dp->dccps_awl, dp->dccps_awh)) {		!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;		goto out;
	}		}

	@@ -431,11 +431,11 @@ struct sock dccp_v4_request_recv_sock(const struct sock sk,
	return newsk;		return newsk;

	exit_overflow:		exit_overflow:
	NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_LISTENOVERFLOWS);		__NET_INC_STATS(sock_net(sk), LINUX_MIB_LISTENOVERFLOWS);
	exit_nonewsk:		exit_nonewsk:
	dst_release(dst);		dst_release(dst);
	exit:		exit:
	NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_LISTENDROPS);		__NET_INC_STATS(sock_net(sk), LINUX_MIB_LISTENDROPS);
	return NULL;		return NULL;
	put_and_exit:		put_and_exit:
	inet_csk_prepare_forced_close(newsk);		inet_csk_prepare_forced_close(newsk);

net/dccp/ipv6.c

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -106,7 +106,7 @@ static void dccp_v6_err(struct sk_buff skb, struct inet6_skb_parm opt,

	bh_lock_sock(sk);		bh_lock_sock(sk);
	if (sock_owned_by_user(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)		if (sk->sk_state == DCCP_CLOSED)
	goto out;		goto out;
	@@ -114,7 +114,7 @@ static void dccp_v6_err(struct sk_buff skb, struct inet6_skb_parm opt,
	dp = dccp_sk(sk);		dp = dccp_sk(sk);
	if ((1 << sk->sk_state) & ~(DCCPF_REQUESTING \| DCCPF_LISTEN) &&		if ((1 << sk->sk_state) & ~(DCCPF_REQUESTING \| DCCPF_LISTEN) &&
	!between48(seq, dp->dccps_awl, dp->dccps_awh)) {		!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;		goto out;
	}		}

	@@ -527,11 +527,11 @@ static struct sock dccp_v6_request_recv_sock(const struct sock sk,
	return newsk;		return newsk;

	out_overflow:		out_overflow:
	NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_LISTENOVERFLOWS);		__NET_INC_STATS(sock_net(sk), LINUX_MIB_LISTENOVERFLOWS);
	out_nonewsk:		out_nonewsk:
	dst_release(dst);		dst_release(dst);
	out:		out:
	NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_LISTENDROPS);		__NET_INC_STATS(sock_net(sk), LINUX_MIB_LISTENDROPS);
	return NULL;		return NULL;
	}		}