Commit de0744af authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller
Browse files

mib: add net to NET_INC_STATS_BH 



Signed-off-by: default avatarPavel Emelyanov <xemul@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4e673444

include/net/ip.h

+1 −1
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ DECLARE_SNMP_STAT(struct ipstats_mib, ip_statistics); 
#define IP_ADD_STATS_BH(net, field, val) SNMP_ADD_STATS_BH(ip_statistics, field, val)

DECLARE_SNMP_STAT(struct linux_mib, net_statistics);

#define NET_INC_STATS(net, field)	do { (void)net; SNMP_INC_STATS(net_statistics, field); } while (0)

#define NET_INC_STATS_BH(field)		SNMP_INC_STATS_BH(net_statistics, field)

#define NET_INC_STATS_BH(net, field)	do { (void)net; SNMP_INC_STATS_BH(net_statistics, field); } while (0)

#define NET_INC_STATS_USER(field) 	SNMP_INC_STATS_USER(net_statistics, field)

#define NET_ADD_STATS_BH(field, adnd)	SNMP_ADD_STATS_BH(net_statistics, field, adnd)

#define NET_ADD_STATS_USER(field, adnd)	SNMP_ADD_STATS_USER(net_statistics, field, adnd)

include/net/tcp.h

+1 −1
Original line number Diff line number Diff line
@@ -894,7 +894,7 @@ static inline int tcp_prequeue(struct sock *sk, struct sk_buff *skb) 


			while ((skb1 = __skb_dequeue(&tp->ucopy.prequeue)) != NULL) {

				sk->sk_backlog_rcv(sk, skb1);

				NET_INC_STATS_BH(LINUX_MIB_TCPPREQUEUEDROPPED);

				NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_TCPPREQUEUEDROPPED);

			}



			tp->ucopy.memory = 0;

net/dccp/ipv4.c

+5 −5
Original line number Diff line number Diff line
@@ -230,7 +230,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(LINUX_MIB_LOCKDROPPEDICMPS);

		NET_INC_STATS_BH(net, LINUX_MIB_LOCKDROPPEDICMPS);



	if (sk->sk_state == DCCP_CLOSED)

		goto out;
@@ -239,7 +239,7 @@ static void dccp_v4_err(struct sk_buff *skb, u32 info) 
	seq = dccp_hdr_seq(dh);

	if ((1 << sk->sk_state) & ~(DCCPF_REQUESTING | DCCPF_LISTEN) &&

	    !between48(seq, dp->dccps_swl, dp->dccps_swh)) {

		NET_INC_STATS_BH(LINUX_MIB_OUTOFWINDOWICMPS);

		NET_INC_STATS_BH(net, LINUX_MIB_OUTOFWINDOWICMPS);

		goto out;

	}
@@ -286,7 +286,7 @@ static void dccp_v4_err(struct sk_buff *skb, u32 info) 
		BUG_TRAP(!req->sk);



		if (seq != dccp_rsk(req)->dreq_iss) {

			NET_INC_STATS_BH(LINUX_MIB_OUTOFWINDOWICMPS);

			NET_INC_STATS_BH(net, LINUX_MIB_OUTOFWINDOWICMPS);

			goto out;

		}

		/*
@@ -409,9 +409,9 @@ struct sock *dccp_v4_request_recv_sock(struct sock *sk, struct sk_buff *skb, 
	return newsk;



exit_overflow:

	NET_INC_STATS_BH(LINUX_MIB_LISTENOVERFLOWS);

	NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_LISTENOVERFLOWS);

exit:

	NET_INC_STATS_BH(LINUX_MIB_LISTENDROPS);

	NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_LISTENDROPS);

	dst_release(dst);

	return NULL;

}

net/dccp/ipv6.c

+4 −4
Original line number Diff line number Diff line
@@ -111,7 +111,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(LINUX_MIB_LOCKDROPPEDICMPS);

		NET_INC_STATS_BH(net, LINUX_MIB_LOCKDROPPEDICMPS);



	if (sk->sk_state == DCCP_CLOSED)

		goto out;
@@ -189,7 +189,7 @@ static void dccp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, 
		BUG_TRAP(req->sk == NULL);



		if (seq != dccp_rsk(req)->dreq_iss) {

			NET_INC_STATS_BH(LINUX_MIB_OUTOFWINDOWICMPS);

			NET_INC_STATS_BH(net, LINUX_MIB_OUTOFWINDOWICMPS);

			goto out;

		}
@@ -630,9 +630,9 @@ static struct sock *dccp_v6_request_recv_sock(struct sock *sk, 
	return newsk;



out_overflow:

	NET_INC_STATS_BH(LINUX_MIB_LISTENOVERFLOWS);

	NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_LISTENOVERFLOWS);

out:

	NET_INC_STATS_BH(LINUX_MIB_LISTENDROPS);

	NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_LISTENDROPS);

	if (opt != NULL && opt != np->opt)

		sock_kfree_s(sk, opt, opt->tot_len);

	dst_release(dst);

net/dccp/timer.c

+2 −2
Original line number Diff line number Diff line
@@ -224,7 +224,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(LINUX_MIB_DELAYEDACKLOCKED);

		NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_DELAYEDACKLOCKED);

		sk_reset_timer(sk, &icsk->icsk_delack_timer,

			       jiffies + TCP_DELACK_MIN);

		goto out;
@@ -254,7 +254,7 @@ static void dccp_delack_timer(unsigned long data) 
			icsk->icsk_ack.ato = TCP_ATO_MIN;

		}

		dccp_send_ack(sk);

		NET_INC_STATS_BH(LINUX_MIB_DELAYEDACKS);

		NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_DELAYEDACKS);

	}

out:

	bh_unlock_sock(sk);