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

mib: put ip statistics on struct net 



Similar to tcp one.

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

include/net/ip.h

+3 −4
Original line number Diff line number Diff line
@@ -156,10 +156,9 @@ struct ipv4_config 
};



extern struct ipv4_config ipv4_config;

DECLARE_SNMP_STAT(struct ipstats_mib, ip_statistics);

#define IP_INC_STATS(net, field)	do { (void)net; SNMP_INC_STATS(ip_statistics, field); } while (0)

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

#define IP_INC_STATS(net, field)	SNMP_INC_STATS((net)->mib.ip_statistics, field)

#define IP_INC_STATS_BH(net, field)	SNMP_INC_STATS_BH((net)->mib.ip_statistics, field)

#define IP_ADD_STATS_BH(net, field, val) SNMP_ADD_STATS_BH((net)->mib.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(net, field)	do { (void)net; SNMP_INC_STATS_BH(net_statistics, field); } while (0)

include/net/netns/mib.h

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 


struct netns_mib {

	DEFINE_SNMP_STAT(struct tcp_mib, tcp_statistics);

	DEFINE_SNMP_STAT(struct ipstats_mib, ip_statistics);

};



#endif

net/ipv4/af_inet.c

+6 −5
Original line number Diff line number Diff line
@@ -1345,16 +1345,22 @@ static __net_init int ipv4_mib_init_net(struct net *net) 
	if (snmp_mib_init((void **)net->mib.tcp_statistics,

			  sizeof(struct tcp_mib)) < 0)

		goto err_tcp_mib;

	if (snmp_mib_init((void **)net->mib.ip_statistics,

			  sizeof(struct ipstats_mib)) < 0)

		goto err_ip_mib;



	tcp_mib_init(net);

	return 0;



err_ip_mib:

	snmp_mib_free((void **)net->mib.tcp_statistics);

err_tcp_mib:

	return -ENOMEM;

}



static __net_exit void ipv4_mib_exit_net(struct net *net)

{

	snmp_mib_free((void **)net->mib.ip_statistics);

	snmp_mib_free((void **)net->mib.tcp_statistics);

}
@@ -1368,9 +1374,6 @@ static int __init init_ipv4_mibs(void) 
	if (snmp_mib_init((void **)net_statistics,

			  sizeof(struct linux_mib)) < 0)

		goto err_net_mib;

	if (snmp_mib_init((void **)ip_statistics,

			  sizeof(struct ipstats_mib)) < 0)

		goto err_ip_mib;

	if (snmp_mib_init((void **)icmp_statistics,

			  sizeof(struct icmp_mib)) < 0)

		goto err_icmp_mib;
@@ -1398,8 +1401,6 @@ static int __init init_ipv4_mibs(void) 
err_icmpmsg_mib:

	snmp_mib_free((void **)icmp_statistics);

err_icmp_mib:

	snmp_mib_free((void **)ip_statistics);

err_ip_mib:

	snmp_mib_free((void **)net_statistics);

err_net_mib:

	return -ENOMEM;

net/ipv4/ip_input.c

+0 −8
Original line number Diff line number Diff line
@@ -144,12 +144,6 @@ 
#include <linux/mroute.h>

#include <linux/netlink.h>



/*

 *	SNMP management statistics

 */



DEFINE_SNMP_STAT(struct ipstats_mib, ip_statistics) __read_mostly;



/*

 *	Process Router Attention IP option

 */
@@ -447,5 +441,3 @@ int ip_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt, 
out:

	return NET_RX_DROP;

}
 


EXPORT_SYMBOL(ip_statistics);

net/ipv4/proc.c

+2 −2
Original line number Diff line number Diff line
@@ -344,7 +344,7 @@ static int snmp_seq_show(struct seq_file *seq, void *v) 


	for (i = 0; snmp4_ipstats_list[i].name != NULL; i++)

		seq_printf(seq, " %lu",

			   snmp_fold_field((void **)ip_statistics,

			   snmp_fold_field((void **)init_net.mib.ip_statistics,

					   snmp4_ipstats_list[i].entry));



	icmp_put(seq);	/* RFC 2011 compatibility */
@@ -431,7 +431,7 @@ static int netstat_seq_show(struct seq_file *seq, void *v) 
	seq_puts(seq, "\nIpExt:");

	for (i = 0; snmp4_ipextstats_list[i].name != NULL; i++)

		seq_printf(seq, " %lu",

			   snmp_fold_field((void **)ip_statistics,

			   snmp_fold_field((void **)init_net.mib.ip_statistics,

					   snmp4_ipextstats_list[i].entry));



	seq_putc(seq, '\n');