1 files changed, 13 insertions, 15 deletions

diff --git a/include/net/udp.h b/include/net/udp.h
index ccce83707046..addcdc67234c 100644
--- a/include/net/udp.h
+++ b/include/net/udp.h
@@ -148,27 +148,25 @@ 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 */
-DECLARE_SNMP_STAT(struct udp_mib, udplite_statistics);
 DECLARE_SNMP_STAT(struct udp_mib, udplite_stats_in6);
 
 /*
  *      SNMP statistics for UDP and UDP-Lite
  */
-#define UDP_INC_STATS_USER(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(field, is_udplite)                            do  {  \
-        if (is_udplite) SNMP_INC_STATS_BH(udplite_statistics, field);         \
-        else            SNMP_INC_STATS_BH(udp_statistics, field);    }  while(0)
-
-#define UDP6_INC_STATS_BH(field, is_udplite)                          do  {  \
+#define UDP_INC_STATS_USER(net, field, is_udplite)            do { \
+        if (is_udplite) SNMP_INC_STATS_USER((net)->mib.udplite_statistics, field);       \
+        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((net)->mib.udplite_statistics, field);         \
+        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);         \
         else            SNMP_INC_STATS_BH(udp_stats_in6, field);    } while(0)
-#define UDP6_INC_STATS_USER(field, is_udplite)                         do {    \
+#define UDP6_INC_STATS_USER(net, field, is_udplite)         do { (void)net;    \
         if (is_udplite) SNMP_INC_STATS_USER(udplite_stats_in6, field);         \
         else            SNMP_INC_STATS_USER(udp_stats_in6, field);    } while(0)
 
@@ -176,12 +174,12 @@ DECLARE_SNMP_STAT(struct udp_mib, udplite_stats_in6);
 #define UDPX_INC_STATS_BH(sk, field) \
         do { \
                 if ((sk)->sk_family == AF_INET) \
-                        UDP_INC_STATS_BH(field, 0); \
+                        UDP_INC_STATS_BH(sock_net(sk), field, 0); \
                 else \
-                        UDP6_INC_STATS_BH(field, 0); \
+                        UDP6_INC_STATS_BH(sock_net(sk), field, 0); \
         } while (0);
 #else
-#define UDPX_INC_STATS_BH(sk, field) UDP_INC_STATS_BH(field, 0)
+#define UDPX_INC_STATS_BH(sk, field) UDP_INC_STATS_BH(sock_net(sk), field, 0)
 #endif
 
 /* /proc */
@@ -196,8 +194,8 @@ struct udp_seq_afinfo {
 struct udp_iter_state {
         struct seq_net_private  p;
         sa_family_t             family;
-        struct hlist_head       *hashtable;
         int                     bucket;
+        struct hlist_head       *hashtable;
 };
 
 #ifdef CONFIG_PROC_FS