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

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

mib: add net to NET_INC_STATS 



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

include/net/ip.h

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ DECLARE_SNMP_STAT(struct ipstats_mib, ip_statistics); 
#define IP_INC_STATS_BH(net, field)	do { (void)net; SNMP_INC_STATS_BH(ip_statistics, field); } while (0)

#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(field)		SNMP_INC_STATS(net_statistics, field)

#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_USER(field) 	SNMP_INC_STATS_USER(net_statistics, field)

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

net/ipv4/tcp.c

+1 −1
Original line number Diff line number Diff line
@@ -319,7 +319,7 @@ EXPORT_SYMBOL(tcp_memory_pressure); 
void tcp_enter_memory_pressure(struct sock *sk)

{

	if (!tcp_memory_pressure) {

		NET_INC_STATS(LINUX_MIB_TCPMEMORYPRESSURES);

		NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPMEMORYPRESSURES);

		tcp_memory_pressure = 1;

	}

}

net/ipv4/tcp_output.c

+2 −2
Original line number Diff line number Diff line
@@ -2119,7 +2119,7 @@ void tcp_send_active_reset(struct sock *sk, gfp_t priority) 
	/* NOTE: No TCP options attached and we never retransmit this. */

	skb = alloc_skb(MAX_TCP_HEADER, priority);

	if (!skb) {

		NET_INC_STATS(LINUX_MIB_TCPABORTFAILED);

		NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPABORTFAILED);

		return;

	}
@@ -2130,7 +2130,7 @@ void tcp_send_active_reset(struct sock *sk, gfp_t priority) 
	/* Send it off. */

	TCP_SKB_CB(skb)->when = tcp_time_stamp;

	if (tcp_transmit_skb(sk, skb, 0, priority))

		NET_INC_STATS(LINUX_MIB_TCPABORTFAILED);

		NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPABORTFAILED);



	TCP_INC_STATS(sock_net(sk), TCP_MIB_OUTRSTS);

}