summaryrefslogtreecommitdiffstats
path: root/include/net/udp.h
diff options
context:
space:
mode:
authorDenis V. Lunev <den@openvz.org>2008-10-07 14:49:36 -0700
committerDavid S. Miller <davem@davemloft.net>2008-10-07 14:49:36 -0700
commit0c7ed677fb7013c8028045d409a48ac42151187a (patch)
tree7449bac3fd2433b541da0d458cf0aecfb90451b8 /include/net/udp.h
parente43291cb37406dae405d50332eaa1ba2264c8dce (diff)
downloadlinux-0c7ed677fb7013c8028045d409a48ac42151187a.tar.gz
linux-0c7ed677fb7013c8028045d409a48ac42151187a.tar.bz2
linux-0c7ed677fb7013c8028045d409a48ac42151187a.zip
netns: make udpv6 mib per/namespace
Signed-off-by: Denis V. Lunev <den@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/udp.h')
-rw-r--r--include/net/udp.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/include/net/udp.h b/include/net/udp.h
index d38f6f2419f9..72f28c3ddaae 100644
--- a/include/net/udp.h
+++ b/include/net/udp.h
@@ -152,8 +152,6 @@ extern struct sock *udp4_lib_lookup(struct net *net, __be32 saddr, __be16 sport,
__be32 daddr, __be16 dport,
int dif);
-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_stats_in6);
@@ -167,12 +165,14 @@ DECLARE_SNMP_STAT(struct udp_mib, udplite_stats_in6);
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; \
+#define UDP6_INC_STATS_BH(net, field, is_udplite) do { \
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(net, field, is_udplite) do { (void)net; \
+ 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(udp_stats_in6, field); } while(0)
+ else SNMP_INC_STATS_USER((net)->mib.udp_stats_in6, field); \
+} while(0)
#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
#define UDPX_INC_STATS_BH(sk, field) \