aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDaniel Lezcano <dlezcano@fr.ibm.com>2008-01-10 05:54:53 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:01:18 -0500
commit99bc9c4e45e7e783cf0b0a25cc03a103c038f254 (patch)
treee6598bc44e2003761e9ee65f06c4062287c1ed0d /include
parent760f2d0186225f06d46e07232d65219c5055cad3 (diff)
[NETNS][IPV6]: Make bindv6only sysctl per namespace.
This patch moves the bindv6only sysctl to the network namespace structure. Until the ipv6 protocol is not per namespace, the sysctl variable is always from the initial network namespace. Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r--include/net/ipv6.h1
-rw-r--r--include/net/netns/ipv6.h1
2 files changed, 1 insertions, 1 deletions
diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index 5519035491e7..d03a4076e227 100644
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
@@ -109,7 +109,6 @@ struct frag_hdr {
109#include <net/sock.h> 109#include <net/sock.h>
110 110
111/* sysctls */ 111/* sysctls */
112extern int sysctl_ipv6_bindv6only;
113extern int sysctl_mld_max_msf; 112extern int sysctl_mld_max_msf;
114 113
115extern struct ctl_path net_ipv6_ctl_path[]; 114extern struct ctl_path net_ipv6_ctl_path[];
diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h
index 58fbf30d9fdb..42b9b412fb87 100644
--- a/include/net/netns/ipv6.h
+++ b/include/net/netns/ipv6.h
@@ -11,6 +11,7 @@ struct netns_sysctl_ipv6 {
11#ifdef CONFIG_SYSCTL 11#ifdef CONFIG_SYSCTL
12 struct ctl_table_header *table; 12 struct ctl_table_header *table;
13#endif 13#endif
14 int bindv6only;
14}; 15};
15 16
16struct netns_ipv6 { 17struct netns_ipv6 {