summaryrefslogtreecommitdiffstats
path: root/net/ipv6
diff options
context:
space:
mode:
authorFX Le Bail <fx.lebail@yahoo.com>2014-01-13 15:59:01 +0100
committerDavid S. Miller <davem@davemloft.net>2014-01-14 18:18:22 -0800
commitec35b61ea59aa6b1ecc8d8452b225e4677e32627 (patch)
treee1ca5bd62514639fce20cc381d51feac1ed6bf36 /net/ipv6
parent0e864b21e5080bc3f178a4729bc4f7bca77188bc (diff)
downloadlinux-stable-ec35b61ea59aa6b1ecc8d8452b225e4677e32627.tar.gz
linux-stable-ec35b61ea59aa6b1ecc8d8452b225e4677e32627.tar.bz2
linux-stable-ec35b61ea59aa6b1ecc8d8452b225e4677e32627.zip
IPv6: move the anycast_src_echo_reply sysctl to netns_sysctl_ipv6
This change move anycast_src_echo_reply sysctl with other ipv6 sysctls. Suggested-by: Hannes Frederic Sowa <hannes@stressinduktion.org> Signed-off-by: Francois-Xavier Le Bail <fx.lebail@yahoo.com> Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
-rw-r--r--net/ipv6/icmp.c2
-rw-r--r--net/ipv6/sysctl_net_ipv6.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
index 8003b4930267..902405dc258c 100644
--- a/net/ipv6/icmp.c
+++ b/net/ipv6/icmp.c
@@ -559,7 +559,7 @@ static void icmpv6_echo_reply(struct sk_buff *skb)
saddr = &ipv6_hdr(skb)->daddr;
if (!ipv6_unicast_destination(skb) &&
- !(net->ipv6.anycast_src_echo_reply &&
+ !(net->ipv6.sysctl.anycast_src_echo_reply &&
ipv6_anycast_destination(skb)))
saddr = NULL;
diff --git a/net/ipv6/sysctl_net_ipv6.c b/net/ipv6/sysctl_net_ipv6.c
index 6b6a2c83027e..b51b2688102c 100644
--- a/net/ipv6/sysctl_net_ipv6.c
+++ b/net/ipv6/sysctl_net_ipv6.c
@@ -26,7 +26,7 @@ static struct ctl_table ipv6_table_template[] = {
},
{
.procname = "anycast_src_echo_reply",
- .data = &init_net.ipv6.anycast_src_echo_reply,
+ .data = &init_net.ipv6.sysctl.anycast_src_echo_reply,
.maxlen = sizeof(int),
.mode = 0644,
.proc_handler = proc_dointvec
@@ -58,7 +58,7 @@ static int __net_init ipv6_sysctl_net_init(struct net *net)
if (!ipv6_table)
goto out;
ipv6_table[0].data = &net->ipv6.sysctl.bindv6only;
- ipv6_table[1].data = &net->ipv6.anycast_src_echo_reply;
+ ipv6_table[1].data = &net->ipv6.sysctl.anycast_src_echo_reply;
ipv6_route_table = ipv6_route_sysctl_init(net);
if (!ipv6_route_table)