summaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2012-04-19 13:37:09 +0000
committerDavid S. Miller <davem@davemloft.net>2012-04-20 21:22:29 -0400
commit6dceb03687124b6ee392eb1d9921bd463eab3190 (patch)
treef7a5de779c5cc5cc1d660fabe0678de9c606b83e /include/net
parent64fb3010400f6051261be9c5c74f29de416dad8f (diff)
downloadlinux-stable-6dceb03687124b6ee392eb1d9921bd463eab3190.tar.gz
linux-stable-6dceb03687124b6ee392eb1d9921bd463eab3190.tar.bz2
linux-stable-6dceb03687124b6ee392eb1d9921bd463eab3190.zip
net ipv6: Don't use sysctl tables with .child entries.
The sysctl core no longer natively understands sysctl tables with .child entries. Split the ipv6_table to remove the .child entries. Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Acked-by: Pavel Emelyanov <xemul@parallels.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/netns/ipv6.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h
index 81abfcb2eb4e..b42be53587ba 100644
--- a/include/net/netns/ipv6.h
+++ b/include/net/netns/ipv6.h
@@ -12,7 +12,9 @@ struct ctl_table_header;
struct netns_sysctl_ipv6 {
#ifdef CONFIG_SYSCTL
- struct ctl_table_header *table;
+ struct ctl_table_header *hdr;
+ struct ctl_table_header *route_hdr;
+ struct ctl_table_header *icmp_hdr;
struct ctl_table_header *frags_hdr;
#endif
int bindv6only;