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

Commit be713a44 authored by Denis V. Lunev's avatar Denis V. Lunev Committed by David S. Miller
Browse files

netns: make uplitev6 mib per/namespace 



Signed-off-by: default avatarDenis V. Lunev <den@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0c7ed677

include/net/netns/mib.h

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ struct netns_mib { 
#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)

	struct proc_dir_entry *proc_net_devsnmp6;

	DEFINE_SNMP_STAT(struct udp_mib, udp_stats_in6);

	DEFINE_SNMP_STAT(struct udp_mib, udplite_stats_in6);

#endif

};

include/net/udp.h

+4 −7
Original line number Diff line number Diff line
@@ -152,9 +152,6 @@ extern struct sock *udp4_lib_lookup(struct net *net, __be32 saddr, __be16 sport, 
				    __be32 daddr, __be16 dport,

				    int dif);



/* UDP-Lite does not have a standardized MIB yet, so we inherit from UDP */

DECLARE_SNMP_STAT(struct udp_mib, udplite_stats_in6);



/*

 * 	SNMP statistics for UDP and UDP-Lite

 */
@@ -166,11 +163,11 @@ DECLARE_SNMP_STAT(struct udp_mib, udplite_stats_in6); 
	else		SNMP_INC_STATS_BH((net)->mib.udp_statistics, field);    }  while(0)



#define UDP6_INC_STATS_BH(net, field, is_udplite) 	    do { \

	if (is_udplite) SNMP_INC_STATS_BH(udplite_stats_in6, field);         \

	if (is_udplite) SNMP_INC_STATS_BH((net)->mib.udplite_stats_in6, field);\

	else		SNMP_INC_STATS_BH((net)->mib.udp_stats_in6, field);  \

} while(0)

#define UDP6_INC_STATS_USER(net, field, is_udplite)	    do { \

	if (is_udplite) SNMP_INC_STATS_USER(udplite_stats_in6, field);         \

#define UDP6_INC_STATS_USER(net, field, __lite)		    do { \

	if (__lite) SNMP_INC_STATS_USER((net)->mib.udplite_stats_in6, field);  \

	else	    SNMP_INC_STATS_USER((net)->mib.udp_stats_in6, field);      \

} while(0)

net/ipv6/af_inet6.c

+8 −6
Original line number Diff line number Diff line
@@ -806,13 +806,8 @@ static int __init init_ipv6_mibs(void) 
	if (snmp_mib_init((void **)icmpv6msg_statistics,

			  sizeof(struct icmpv6msg_mib)) < 0)

		goto err_icmpmsg_mib;

	if (snmp_mib_init((void **)udplite_stats_in6,

			  sizeof (struct udp_mib)) < 0)

		goto err_udplite_mib;

	return 0;



err_udplite_mib:

	snmp_mib_free((void **)icmpv6msg_statistics);

err_icmpmsg_mib:

	snmp_mib_free((void **)icmpv6_statistics);

err_icmp_mib:
@@ -827,7 +822,6 @@ static void cleanup_ipv6_mibs(void) 
	snmp_mib_free((void **)ipv6_statistics);

	snmp_mib_free((void **)icmpv6_statistics);

	snmp_mib_free((void **)icmpv6msg_statistics);

	snmp_mib_free((void **)udplite_stats_in6);

}



static int __net_init ipv6_init_mibs(struct net *net)
@@ -835,12 +829,20 @@ static int __net_init ipv6_init_mibs(struct net *net) 
	if (snmp_mib_init((void **)net->mib.udp_stats_in6,

			  sizeof (struct udp_mib)) < 0)

		return -ENOMEM;

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

			  sizeof (struct udp_mib)) < 0)

		goto err_udplite_mib;

	return 0;



err_udplite_mib:

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

	return -ENOMEM;

}



static void __net_exit ipv6_cleanup_mibs(struct net *net)

{

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

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

}



static int inet6_net_init(struct net *net)

net/ipv6/proc.c

+2 −1
Original line number Diff line number Diff line
@@ -182,7 +182,8 @@ static int snmp6_seq_show(struct seq_file *seq, void *v) 
	snmp6_seq_show_icmpv6msg(seq, (void **)icmpv6msg_statistics);

	snmp6_seq_show_item(seq, (void **)net->mib.udp_stats_in6,

			    snmp6_udp6_list);

	snmp6_seq_show_item(seq, (void **)udplite_stats_in6, snmp6_udplite6_list);

	snmp6_seq_show_item(seq, (void **)net->mib.udplite_stats_in6,

			    snmp6_udplite6_list);

	return 0;

}

net/ipv6/udplite.c

+0 −2
Original line number Diff line number Diff line
@@ -13,8 +13,6 @@ 
 */

#include "udp_impl.h"



DEFINE_SNMP_STAT(struct udp_mib, udplite_stats_in6) __read_mostly;



static int udplitev6_rcv(struct sk_buff *skb)

{

	return __udp6_lib_rcv(skb, udplite_hash, IPPROTO_UDPLITE);