A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-29 11:11:45 -04:00
Code Issues Projects Releases Packages Wiki Activity

IPv6: move the anycast_src_echo_reply sysctl to netns_sysctl_ipv6

Browse source 
This change move anycast_src_echo_reply sysctl with other ipv6 sysctls.

Suggested-by: Hannes Frederic Sowa <[email protected]>
Signed-off-by: Francois-Xavier Le Bail <[email protected]>
Acked-by: Hannes Frederic Sowa <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
FX Le Bail 2014-01-13 15:59:01 +01:00 • committed by David S. Miller
commit ec35b61ea5
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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)