netns: make uplitev6 mib per/namespace

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

3 files changed, 10 insertions, 9 deletions

diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
index e09139122efe..127b240d2d81 100644
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@ -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)
diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c
index 3eaf20bf998f..c78cf754ef3f 100644
--- a/net/ipv6/proc.c
+++ b/net/ipv6/proc.c
@@ -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;
 }
 
diff --git a/net/ipv6/udplite.c b/net/ipv6/udplite.c
index f6cdcb348e05..3cd1a1ac3d6c 100644
--- a/net/ipv6/udplite.c
+++ b/net/ipv6/udplite.c
@@ -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);