netns: make udpv6 mib per/namespace

Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

3 files changed, 6 insertions, 9 deletions

diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 822c9deac83b..85f8e8e10b1b 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -108,9 +108,6 @@
  *      Snmp MIB for the UDP layer
  */
 
-DEFINE_SNMP_STAT(struct udp_mib, udp_stats_in6) __read_mostly;
-EXPORT_SYMBOL(udp_stats_in6);
-
 struct hlist_head udp_hash[UDP_HTABLE_SIZE];
 DEFINE_RWLOCK(udp_hash_lock);
 
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
index e8f82eca1609..e09139122efe 100644
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@ -806,16 +806,12 @@ 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 **)udp_stats_in6, sizeof (struct udp_mib)) < 0)
-                goto err_udp_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 **)udp_stats_in6);
-err_udp_mib:
         snmp_mib_free((void **)icmpv6msg_statistics);
 err_icmpmsg_mib:
         snmp_mib_free((void **)icmpv6_statistics);
@@ -831,17 +827,20 @@ 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 **)udp_stats_in6);
         snmp_mib_free((void **)udplite_stats_in6);
 }
 
 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;
         return 0;
 }
 
 static void __net_exit ipv6_cleanup_mibs(struct net *net)
 {
+        snmp_mib_free((void **)net->mib.udp_stats_in6);
 }
 
 static int inet6_net_init(struct net *net)
diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c
index 23e567fb1d37..3eaf20bf998f 100644
--- a/net/ipv6/proc.c
+++ b/net/ipv6/proc.c
@@ -180,7 +180,8 @@ static int snmp6_seq_show(struct seq_file *seq, void *v)
         snmp6_seq_show_item(seq, (void **)ipv6_statistics, snmp6_ipstats_list);
         snmp6_seq_show_item(seq, (void **)icmpv6_statistics, snmp6_icmp6_list);
         snmp6_seq_show_icmpv6msg(seq, (void **)icmpv6msg_statistics);
-        snmp6_seq_show_item(seq, (void **)udp_stats_in6, snmp6_udp6_list);
+        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);
         return 0;
 }