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

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

mib: add net to NET_INC_STATS_USER 



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

include/net/ip.h

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ DECLARE_SNMP_STAT(struct ipstats_mib, ip_statistics); 
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(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_INC_STATS_USER(net, field) 	do { (void)net; SNMP_INC_STATS_USER(net_statistics, field); } while (0)

#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)

net/ipv4/tcp.c

+3 −3
Original line number Diff line number Diff line
@@ -1153,7 +1153,7 @@ static void tcp_prequeue_process(struct sock *sk) 
	struct sk_buff *skb;

	struct tcp_sock *tp = tcp_sk(sk);



	NET_INC_STATS_USER(LINUX_MIB_TCPPREQUEUED);

	NET_INC_STATS_USER(sock_net(sk), LINUX_MIB_TCPPREQUEUED);



	/* RX process wants to run with disabled BHs, though it is not

	 * necessary */
@@ -1793,13 +1793,13 @@ void tcp_close(struct sock *sk, long timeout) 
	 */

	if (data_was_unread) {

		/* Unread data was tossed, zap the connection. */

		NET_INC_STATS_USER(LINUX_MIB_TCPABORTONCLOSE);

		NET_INC_STATS_USER(sock_net(sk), LINUX_MIB_TCPABORTONCLOSE);

		tcp_set_state(sk, TCP_CLOSE);

		tcp_send_active_reset(sk, GFP_KERNEL);

	} else if (sock_flag(sk, SOCK_LINGER) && !sk->sk_lingertime) {

		/* Check zero linger _after_ checking for unread data. */

		sk->sk_prot->disconnect(sk, 0);

		NET_INC_STATS_USER(LINUX_MIB_TCPABORTONDATA);

		NET_INC_STATS_USER(sock_net(sk), LINUX_MIB_TCPABORTONDATA);

	} else if (tcp_close_state(sk)) {

		/* We FIN if the application ate all the data before

		 * zapping the connection.