diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-10-12 06:35:23 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-10-12 06:37:32 -0400 |
commit | 365d46dc9be9b3c833990a06f3994b1987eda578 (patch) | |
tree | 9397d1304144a288411f2118707f44ff5e862fa6 /include/net/netns/mib.h | |
parent | 5dc64a3442b98eaa0e3730c35fcf00cf962a93e7 (diff) | |
parent | fd048088306656824958e7783ffcee27e241b361 (diff) |
Merge branch 'linus' into x86/xen
Conflicts:
arch/x86/kernel/cpu/common.c
arch/x86/kernel/process_64.c
arch/x86/xen/enlighten.c
Diffstat (limited to 'include/net/netns/mib.h')
-rw-r--r-- | include/net/netns/mib.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/net/netns/mib.h b/include/net/netns/mib.h index 449147604642..10cb7c336de5 100644 --- a/include/net/netns/mib.h +++ b/include/net/netns/mib.h | |||
@@ -11,6 +11,15 @@ struct netns_mib { | |||
11 | DEFINE_SNMP_STAT(struct udp_mib, udplite_statistics); | 11 | DEFINE_SNMP_STAT(struct udp_mib, udplite_statistics); |
12 | DEFINE_SNMP_STAT(struct icmp_mib, icmp_statistics); | 12 | DEFINE_SNMP_STAT(struct icmp_mib, icmp_statistics); |
13 | DEFINE_SNMP_STAT(struct icmpmsg_mib, icmpmsg_statistics); | 13 | DEFINE_SNMP_STAT(struct icmpmsg_mib, icmpmsg_statistics); |
14 | |||
15 | #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) | ||
16 | struct proc_dir_entry *proc_net_devsnmp6; | ||
17 | DEFINE_SNMP_STAT(struct udp_mib, udp_stats_in6); | ||
18 | DEFINE_SNMP_STAT(struct udp_mib, udplite_stats_in6); | ||
19 | DEFINE_SNMP_STAT(struct ipstats_mib, ipv6_statistics); | ||
20 | DEFINE_SNMP_STAT(struct icmpv6_mib, icmpv6_statistics); | ||
21 | DEFINE_SNMP_STAT(struct icmpv6msg_mib, icmpv6msg_statistics); | ||
22 | #endif | ||
14 | }; | 23 | }; |
15 | 24 | ||
16 | #endif | 25 | #endif |