netns: make uplitev6 mib per/namespace

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

diff --git a/include/net/netns/mib.h b/include/net/netns/mib.h
index ba622b24b847d4e2ec6bd21c7a6bcb7bfe0aebe3..4e58f0519ce87f665dc825f7ae410563ec41326d 100644 (file)
--- a/include/net/netns/mib.h
+++ b/include/net/netns/mib.h
@@ -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
 };
 

diff --git a/include/net/udp.h b/include/net/udp.h
index 72f28c3ddaae5b119daae2670889927f0f9ce4d6..1e205095ea687aee5f76913a1d03d47c1121e948 100644 (file)
--- a/include/net/udp.h
+++ b/include/net/udp.h
@@ -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,12 +163,12 @@ 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);         \
-       else            SNMP_INC_STATS_USER((net)->mib.udp_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)
 
 #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)

diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
index e09139122efefb08033260ae44c5eae42ce7ae8c..127b240d2d8161f918d6c5cdbeb15f7208e5cbf2 100644 (file)
--- 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 3eaf20bf998f66cc3606c5e9f0f7b3f5d37a0168..c78cf754ef3f68cf38449c89b1e3c16be2bc87f9 100644 (file)
--- 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 f6cdcb348e05be58dce4181172923d153f7a1674..3cd1a1ac3d6c7c8dfb686f9b7992a5be9e3095de 100644 (file)
--- 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);