summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2019-05-24 19:03:34 +0300
committerDavid S. Miller <davem@davemloft.net>2019-05-27 00:08:05 +0300
commit8668d0e2bfdfe3ab85c3bbc45ad2e60ed2dca71c (patch)
treedc976c17ff5e825e4b440b5bcf3f4c0d214adc1d /net
parent8dfdb31335ee5aa99c30bbfd37294844a7ffb648 (diff)
downloadlinux-8668d0e2bfdfe3ab85c3bbc45ad2e60ed2dca71c.tar.xz
ipv6: no longer reference init_net in ip6_frags_ns_ctl_table[]
(struct net *)->ipv6.fqdir will soon be a pointer, so make sure ip6_frags_ns_ctl_table[] does not reference init_net. ip6_frags_ns_ctl_register() can perform the needed initialization for all netns. Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ipv6/reassembly.c15
1 files changed, 5 insertions, 10 deletions
diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
index 5160fd9ed223..aabc9b2e83e4 100644
--- a/net/ipv6/reassembly.c
+++ b/net/ipv6/reassembly.c
@@ -401,23 +401,18 @@ static const struct inet6_protocol frag_protocol = {
static struct ctl_table ip6_frags_ns_ctl_table[] = {
{
.procname = "ip6frag_high_thresh",
- .data = &init_net.ipv6.fqdir.high_thresh,
.maxlen = sizeof(unsigned long),
.mode = 0644,
.proc_handler = proc_doulongvec_minmax,
- .extra1 = &init_net.ipv6.fqdir.low_thresh
},
{
.procname = "ip6frag_low_thresh",
- .data = &init_net.ipv6.fqdir.low_thresh,
.maxlen = sizeof(unsigned long),
.mode = 0644,
.proc_handler = proc_doulongvec_minmax,
- .extra2 = &init_net.ipv6.fqdir.high_thresh
},
{
.procname = "ip6frag_time",
- .data = &init_net.ipv6.fqdir.timeout,
.maxlen = sizeof(int),
.mode = 0644,
.proc_handler = proc_dointvec_jiffies,
@@ -449,12 +444,12 @@ static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
if (!table)
goto err_alloc;
- table[0].data = &net->ipv6.fqdir.high_thresh;
- table[0].extra1 = &net->ipv6.fqdir.low_thresh;
- table[1].data = &net->ipv6.fqdir.low_thresh;
- table[1].extra2 = &net->ipv6.fqdir.high_thresh;
- table[2].data = &net->ipv6.fqdir.timeout;
}
+ table[0].data = &net->ipv6.fqdir.high_thresh;
+ table[0].extra1 = &net->ipv6.fqdir.low_thresh;
+ table[1].data = &net->ipv6.fqdir.low_thresh;
+ table[1].extra2 = &net->ipv6.fqdir.high_thresh;
+ table[2].data = &net->ipv6.fqdir.timeout;
hdr = register_net_sysctl(net, "net/ipv6", table);
if (!hdr)