diff options
Diffstat (limited to 'net/ipv6/reassembly.c')
-rw-r--r-- | net/ipv6/reassembly.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c index 85f3fa382230..852070087307 100644 --- a/net/ipv6/reassembly.c +++ b/net/ipv6/reassembly.c | |||
@@ -658,7 +658,7 @@ static struct ctl_table ip6_frags_ctl_table[] = { | |||
658 | { | 658 | { |
659 | .ctl_name = NET_IPV6_IP6FRAG_SECRET_INTERVAL, | 659 | .ctl_name = NET_IPV6_IP6FRAG_SECRET_INTERVAL, |
660 | .procname = "ip6frag_secret_interval", | 660 | .procname = "ip6frag_secret_interval", |
661 | .data = &init_net.ipv6.sysctl.frags.secret_interval, | 661 | .data = &ip6_frags.secret_interval, |
662 | .maxlen = sizeof(int), | 662 | .maxlen = sizeof(int), |
663 | .mode = 0644, | 663 | .mode = 0644, |
664 | .proc_handler = &proc_dointvec_jiffies, | 664 | .proc_handler = &proc_dointvec_jiffies, |
@@ -719,12 +719,9 @@ static inline void ip6_frags_sysctl_unregister(struct net *net) | |||
719 | 719 | ||
720 | static int ipv6_frags_init_net(struct net *net) | 720 | static int ipv6_frags_init_net(struct net *net) |
721 | { | 721 | { |
722 | ip6_frags.ctl = &net->ipv6.sysctl.frags; | ||
723 | |||
724 | net->ipv6.frags.high_thresh = 256 * 1024; | 722 | net->ipv6.frags.high_thresh = 256 * 1024; |
725 | net->ipv6.frags.low_thresh = 192 * 1024; | 723 | net->ipv6.frags.low_thresh = 192 * 1024; |
726 | net->ipv6.frags.timeout = IPV6_FRAG_TIMEOUT; | 724 | net->ipv6.frags.timeout = IPV6_FRAG_TIMEOUT; |
727 | net->ipv6.sysctl.frags.secret_interval = 10 * 60 * HZ; | ||
728 | 725 | ||
729 | inet_frags_init_net(&net->ipv6.frags); | 726 | inet_frags_init_net(&net->ipv6.frags); |
730 | 727 | ||
@@ -748,6 +745,7 @@ int __init ipv6_frag_init(void) | |||
748 | ip6_frags.qsize = sizeof(struct frag_queue); | 745 | ip6_frags.qsize = sizeof(struct frag_queue); |
749 | ip6_frags.match = ip6_frag_match; | 746 | ip6_frags.match = ip6_frag_match; |
750 | ip6_frags.frag_expire = ip6_frag_expire; | 747 | ip6_frags.frag_expire = ip6_frag_expire; |
748 | ip6_frags.secret_interval = 10 * 60 * HZ; | ||
751 | inet_frags_init(&ip6_frags); | 749 | inet_frags_init(&ip6_frags); |
752 | out: | 750 | out: |
753 | return ret; | 751 | return ret; |