summaryrefslogtreecommitdiffstats
path: root/net/ipv6/reassembly.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/ipv6/reassembly.c')
-rw-r--r--net/ipv6/reassembly.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
index a6f26aa648fb..836ea964cf14 100644
--- a/net/ipv6/reassembly.c
+++ b/net/ipv6/reassembly.c
@@ -98,7 +98,7 @@ fq_find(struct net *net, __be32 id, const struct ipv6hdr *hdr, int iif)
98 IPV6_ADDR_LINKLOCAL))) 98 IPV6_ADDR_LINKLOCAL)))
99 key.iif = 0; 99 key.iif = 0;
100 100
101 q = inet_frag_find(&net->ipv6.fqdir, &key); 101 q = inet_frag_find(net->ipv6.fqdir, &key);
102 if (!q) 102 if (!q)
103 return NULL; 103 return NULL;
104 104
@@ -443,11 +443,11 @@ static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
443 goto err_alloc; 443 goto err_alloc;
444 444
445 } 445 }
446 table[0].data = &net->ipv6.fqdir.high_thresh; 446 table[0].data = &net->ipv6.fqdir->high_thresh;
447 table[0].extra1 = &net->ipv6.fqdir.low_thresh; 447 table[0].extra1 = &net->ipv6.fqdir->low_thresh;
448 table[1].data = &net->ipv6.fqdir.low_thresh; 448 table[1].data = &net->ipv6.fqdir->low_thresh;
449 table[1].extra2 = &net->ipv6.fqdir.high_thresh; 449 table[1].extra2 = &net->ipv6.fqdir->high_thresh;
450 table[2].data = &net->ipv6.fqdir.timeout; 450 table[2].data = &net->ipv6.fqdir->timeout;
451 451
452 hdr = register_net_sysctl(net, "net/ipv6", table); 452 hdr = register_net_sysctl(net, "net/ipv6", table);
453 if (!hdr) 453 if (!hdr)
@@ -510,24 +510,24 @@ static int __net_init ipv6_frags_init_net(struct net *net)
510{ 510{
511 int res; 511 int res;
512 512
513 net->ipv6.fqdir.high_thresh = IPV6_FRAG_HIGH_THRESH;
514 net->ipv6.fqdir.low_thresh = IPV6_FRAG_LOW_THRESH;
515 net->ipv6.fqdir.timeout = IPV6_FRAG_TIMEOUT;
516
517 res = fqdir_init(&net->ipv6.fqdir, &ip6_frags, net); 513 res = fqdir_init(&net->ipv6.fqdir, &ip6_frags, net);
518 if (res < 0) 514 if (res < 0)
519 return res; 515 return res;
520 516
517 net->ipv6.fqdir->high_thresh = IPV6_FRAG_HIGH_THRESH;
518 net->ipv6.fqdir->low_thresh = IPV6_FRAG_LOW_THRESH;
519 net->ipv6.fqdir->timeout = IPV6_FRAG_TIMEOUT;
520
521 res = ip6_frags_ns_sysctl_register(net); 521 res = ip6_frags_ns_sysctl_register(net);
522 if (res < 0) 522 if (res < 0)
523 fqdir_exit(&net->ipv6.fqdir); 523 fqdir_exit(net->ipv6.fqdir);
524 return res; 524 return res;
525} 525}
526 526
527static void __net_exit ipv6_frags_exit_net(struct net *net) 527static void __net_exit ipv6_frags_exit_net(struct net *net)
528{ 528{
529 ip6_frags_ns_sysctl_unregister(net); 529 ip6_frags_ns_sysctl_unregister(net);
530 fqdir_exit(&net->ipv6.fqdir); 530 fqdir_exit(net->ipv6.fqdir);
531} 531}
532 532
533static struct pernet_operations ip6_frags_ops = { 533static struct pernet_operations ip6_frags_ops = {