mib: put icmp statistics on struct net

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

3 files changed, 10 insertions, 11 deletions

diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index bf1f200c6575..5c72bb3adadd 100644
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -1355,10 +1355,15 @@ static __net_init int ipv4_mib_init_net(struct net *net)
         if (snmp_mib_init((void **)net->mib.udplite_statistics,
                           sizeof(struct udp_mib)) < 0)
                 goto err_udplite_mib;
+        if (snmp_mib_init((void **)net->mib.icmp_statistics,
+                          sizeof(struct icmp_mib)) < 0)
+                goto err_icmp_mib;
 
         tcp_mib_init(net);
         return 0;
 
+err_icmp_mib:
+        snmp_mib_free((void **)net->mib.udplite_statistics);
 err_udplite_mib:
         snmp_mib_free((void **)net->mib.udp_statistics);
 err_udp_mib:
@@ -1373,6 +1378,7 @@ err_tcp_mib:
 
 static __net_exit void ipv4_mib_exit_net(struct net *net)
 {
+        snmp_mib_free((void **)net->mib.icmp_statistics);
         snmp_mib_free((void **)net->mib.udplite_statistics);
         snmp_mib_free((void **)net->mib.udp_statistics);
         snmp_mib_free((void **)net->mib.net_statistics);
@@ -1387,9 +1393,6 @@ static __net_initdata struct pernet_operations ipv4_mib_ops = {
 
 static int __init init_ipv4_mibs(void)
 {
-        if (snmp_mib_init((void **)icmp_statistics,
-                          sizeof(struct icmp_mib)) < 0)
-                goto err_icmp_mib;
         if (snmp_mib_init((void **)icmpmsg_statistics,
                           sizeof(struct icmpmsg_mib)) < 0)
                 goto err_icmpmsg_mib;
@@ -1402,8 +1405,6 @@ static int __init init_ipv4_mibs(void)
 err_net:
         snmp_mib_free((void **)icmpmsg_statistics);
 err_icmpmsg_mib:
-        snmp_mib_free((void **)icmp_statistics);
-err_icmp_mib:
         return -ENOMEM;
 }
 
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
index ea60ad41008c..33f958902d9b 100644
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
@@ -114,7 +114,6 @@ struct icmp_bxm {
 /*
  *      Statistics
  */
-DEFINE_SNMP_STAT(struct icmp_mib, icmp_statistics) __read_mostly;
 DEFINE_SNMP_STAT(struct icmpmsg_mib, icmpmsg_statistics) __read_mostly;
 
 /* An array of errno for error messages from dest unreach. */
@@ -1213,5 +1212,4 @@ int __init icmp_init(void)
 
 EXPORT_SYMBOL(icmp_err_convert);
 EXPORT_SYMBOL(icmp_send);
-EXPORT_SYMBOL(icmp_statistics);
 EXPORT_SYMBOL(xrlim_allow);
diff --git a/net/ipv4/proc.c b/net/ipv4/proc.c
index 765418334b3c..6b43cce05587 100644
--- a/net/ipv4/proc.c
+++ b/net/ipv4/proc.c
@@ -311,15 +311,15 @@ static void icmp_put(struct seq_file *seq)
         for (i=0; icmpmibmap[i].name != NULL; i++)
                 seq_printf(seq, " Out%s", icmpmibmap[i].name);
         seq_printf(seq, "\nIcmp: %lu %lu",
-                snmp_fold_field((void **) icmp_statistics, ICMP_MIB_INMSGS),
-                snmp_fold_field((void **) icmp_statistics, ICMP_MIB_INERRORS));
+                snmp_fold_field((void **) init_net.mib.icmp_statistics, ICMP_MIB_INMSGS),
+                snmp_fold_field((void **) init_net.mib.icmp_statistics, ICMP_MIB_INERRORS));
         for (i=0; icmpmibmap[i].name != NULL; i++)
                 seq_printf(seq, " %lu",
                         snmp_fold_field((void **) icmpmsg_statistics,
                                 icmpmibmap[i].index));
         seq_printf(seq, " %lu %lu",
-                snmp_fold_field((void **) icmp_statistics, ICMP_MIB_OUTMSGS),
-                snmp_fold_field((void **) icmp_statistics, ICMP_MIB_OUTERRORS));
+                snmp_fold_field((void **) init_net.mib.icmp_statistics, ICMP_MIB_OUTMSGS),
+                snmp_fold_field((void **) init_net.mib.icmp_statistics, ICMP_MIB_OUTERRORS));
         for (i=0; icmpmibmap[i].name != NULL; i++)
                 seq_printf(seq, " %lu",
                         snmp_fold_field((void **) icmpmsg_statistics,