diff options
Diffstat (limited to 'net/ipv6/af_inet6.c')
-rw-r--r-- | net/ipv6/af_inet6.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c index 72b898fe2dde..70662bf8ab98 100644 --- a/net/ipv6/af_inet6.c +++ b/net/ipv6/af_inet6.c | |||
@@ -66,8 +66,6 @@ MODULE_AUTHOR("Cast of dozens"); | |||
66 | MODULE_DESCRIPTION("IPv6 protocol stack for Linux"); | 66 | MODULE_DESCRIPTION("IPv6 protocol stack for Linux"); |
67 | MODULE_LICENSE("GPL"); | 67 | MODULE_LICENSE("GPL"); |
68 | 68 | ||
69 | int sysctl_ipv6_bindv6only __read_mostly; | ||
70 | |||
71 | /* The inetsw6 table contains everything that inet6_create needs to | 69 | /* The inetsw6 table contains everything that inet6_create needs to |
72 | * build a new socket. | 70 | * build a new socket. |
73 | */ | 71 | */ |
@@ -193,7 +191,7 @@ lookup_protocol: | |||
193 | np->mcast_hops = -1; | 191 | np->mcast_hops = -1; |
194 | np->mc_loop = 1; | 192 | np->mc_loop = 1; |
195 | np->pmtudisc = IPV6_PMTUDISC_WANT; | 193 | np->pmtudisc = IPV6_PMTUDISC_WANT; |
196 | np->ipv6only = sysctl_ipv6_bindv6only; | 194 | np->ipv6only = init_net.ipv6.sysctl.bindv6only; |
197 | 195 | ||
198 | /* Init the ipv4 part of the socket since we can have sockets | 196 | /* Init the ipv4 part of the socket since we can have sockets |
199 | * using v6 API for ipv4. | 197 | * using v6 API for ipv4. |
@@ -721,6 +719,7 @@ static void cleanup_ipv6_mibs(void) | |||
721 | 719 | ||
722 | static int inet6_net_init(struct net *net) | 720 | static int inet6_net_init(struct net *net) |
723 | { | 721 | { |
722 | net->ipv6.sysctl.bindv6only = 0; | ||
724 | return 0; | 723 | return 0; |
725 | } | 724 | } |
726 | 725 | ||