[NETNS][IPV6]: Make icmpv6_time sysctl per namespace.
This patch moves the icmpv6_time sysctl to the network namespace structure. Because the ipv6 protocol is not yet per namespace, the variable is accessed relatively to the initial network namespace. Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:

committed by
David S. Miller

parent
4990509f19
commit
41a76906b3
@@ -154,8 +154,6 @@ static int is_ineligible(struct sk_buff *skb)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int sysctl_icmpv6_time __read_mostly = 1*HZ;
|
||||
|
||||
/*
|
||||
* Check the ICMP output rate limit
|
||||
*/
|
||||
@@ -186,7 +184,7 @@ static inline int icmpv6_xrlim_allow(struct sock *sk, int type,
|
||||
res = 1;
|
||||
} else {
|
||||
struct rt6_info *rt = (struct rt6_info *)dst;
|
||||
int tmo = sysctl_icmpv6_time;
|
||||
int tmo = init_net.ipv6.sysctl.icmpv6_time;
|
||||
|
||||
/* Give more bandwidth to wider prefixes. */
|
||||
if (rt->rt6i_dst.plen < 128)
|
||||
@@ -911,7 +909,7 @@ ctl_table ipv6_icmp_table_template[] = {
|
||||
{
|
||||
.ctl_name = NET_IPV6_ICMP_RATELIMIT,
|
||||
.procname = "ratelimit",
|
||||
.data = &sysctl_icmpv6_time,
|
||||
.data = &init_net.ipv6.sysctl.icmpv6_time,
|
||||
.maxlen = sizeof(int),
|
||||
.mode = 0644,
|
||||
.proc_handler = &proc_dointvec
|
||||
|
Reference in New Issue
Block a user