mib: put udp statistics on struct net

Similar to... ouch, I repeat myself.

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

2 files changed, 5 insertions, 5 deletions

diff --git a/include/net/netns/mib.h b/include/net/netns/mib.h
index b5b1115adfa8..738c87ce183d 100644
--- a/include/net/netns/mib.h
+++ b/include/net/netns/mib.h
@@ -7,6 +7,7 @@ struct netns_mib {
         DEFINE_SNMP_STAT(struct tcp_mib, tcp_statistics);
         DEFINE_SNMP_STAT(struct ipstats_mib, ip_statistics);
         DEFINE_SNMP_STAT(struct linux_mib, net_statistics);
+        DEFINE_SNMP_STAT(struct udp_mib, udp_statistics);
 };
 
 #endif
diff --git a/include/net/udp.h b/include/net/udp.h
index 3e551592aa76..ba5544152708 100644
--- a/include/net/udp.h
+++ b/include/net/udp.h
@@ -148,7 +148,6 @@ extern int 	udp_lib_setsockopt(struct sock *sk, int level, int optname,
                                    char __user *optval, int optlen,
                                    int (*push_pending_frames)(struct sock *));
 
-DECLARE_SNMP_STAT(struct udp_mib, udp_statistics);
 DECLARE_SNMP_STAT(struct udp_mib, udp_stats_in6);
 
 /* UDP-Lite does not have a standardized MIB yet, so we inherit from UDP */
@@ -158,12 +157,12 @@ DECLARE_SNMP_STAT(struct udp_mib, udplite_stats_in6);
 /*
  *      SNMP statistics for UDP and UDP-Lite
  */
-#define UDP_INC_STATS_USER(net, field, is_udplite)            do { (void)net; \
+#define UDP_INC_STATS_USER(net, field, is_udplite)            do { \
         if (is_udplite) SNMP_INC_STATS_USER(udplite_statistics, field);       \
-        else            SNMP_INC_STATS_USER(udp_statistics, field);  }  while(0)
-#define UDP_INC_STATS_BH(net, field, is_udplite)              do { (void)net; \
+        else            SNMP_INC_STATS_USER((net)->mib.udp_statistics, field);  }  while(0)
+#define UDP_INC_STATS_BH(net, field, is_udplite)              do { \
         if (is_udplite) SNMP_INC_STATS_BH(udplite_statistics, field);         \
-        else            SNMP_INC_STATS_BH(udp_statistics, field);    }  while(0)
+        else            SNMP_INC_STATS_BH((net)->mib.udp_statistics, field);    }  while(0)
 
 #define UDP6_INC_STATS_BH(net, field, is_udplite)           do { (void)net;  \
         if (is_udplite) SNMP_INC_STATS_BH(udplite_stats_in6, field);         \