redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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>
hifive-unleashed-5.1
FX Le Bail 2014-01-13 15:59:01 +01:00 committed by David S. Miller
parent 0e864b21e5
commit ec35b61ea5
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/net/netns/ipv6.h
View File

@ -28,6 +28,7 @@ struct netns_sysctl_ipv6 {
int ip6_rt_mtu_expires;
int ip6_rt_min_advmss;
int icmpv6_time;
int anycast_src_echo_reply;
};
struct netns_ipv6 {
@ -73,7 +74,6 @@ struct netns_ipv6 {
#endif
atomic_t dev_addr_genid;
atomic_t rt_genid;
int anycast_src_echo_reply;
};
#if IS_ENABLED(CONFIG_NF_DEFRAG_IPV6)

2
net/ipv6/icmp.c
View File

@ -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;

4
net/ipv6/sysctl_net_ipv6.c
View File

@ -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)