diff options
Diffstat (limited to 'net/ipv6')
-rw-r--r-- | net/ipv6/netfilter/nf_conntrack_reasm.c | 1 | ||||
-rw-r--r-- | net/ipv6/proc.c | 2 | ||||
-rw-r--r-- | net/ipv6/reassembly.c | 6 |
3 files changed, 6 insertions, 3 deletions
diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c index 18accd4eab06..0b9d0097b68d 100644 --- a/net/ipv6/netfilter/nf_conntrack_reasm.c +++ b/net/ipv6/netfilter/nf_conntrack_reasm.c | |||
@@ -712,6 +712,7 @@ int nf_ct_frag6_init(void) | |||
712 | nf_frags.qsize = sizeof(struct nf_ct_frag6_queue); | 712 | nf_frags.qsize = sizeof(struct nf_ct_frag6_queue); |
713 | nf_frags.match = ip6_frag_match; | 713 | nf_frags.match = ip6_frag_match; |
714 | nf_frags.frag_expire = nf_ct_frag6_expire; | 714 | nf_frags.frag_expire = nf_ct_frag6_expire; |
715 | inet_frags_init_net(&nf_init_frags); | ||
715 | inet_frags_init(&nf_frags); | 716 | inet_frags_init(&nf_frags); |
716 | 717 | ||
717 | return 0; | 718 | return 0; |
diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c index 571d95a21c15..dec34c87cb4a 100644 --- a/net/ipv6/proc.c +++ b/net/ipv6/proc.c | |||
@@ -44,7 +44,7 @@ static int sockstat6_seq_show(struct seq_file *seq, void *v) | |||
44 | seq_printf(seq, "RAW6: inuse %d\n", | 44 | seq_printf(seq, "RAW6: inuse %d\n", |
45 | sock_prot_inuse_get(&rawv6_prot)); | 45 | sock_prot_inuse_get(&rawv6_prot)); |
46 | seq_printf(seq, "FRAG6: inuse %d memory %d\n", | 46 | seq_printf(seq, "FRAG6: inuse %d memory %d\n", |
47 | ip6_frag_nqueues(), ip6_frag_mem()); | 47 | ip6_frag_nqueues(&init_net), ip6_frag_mem()); |
48 | return 0; | 48 | return 0; |
49 | } | 49 | } |
50 | 50 | ||
diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c index ab2d53b81b70..77a874020f3a 100644 --- a/net/ipv6/reassembly.c +++ b/net/ipv6/reassembly.c | |||
@@ -84,9 +84,9 @@ struct frag_queue | |||
84 | 84 | ||
85 | static struct inet_frags ip6_frags; | 85 | static struct inet_frags ip6_frags; |
86 | 86 | ||
87 | int ip6_frag_nqueues(void) | 87 | int ip6_frag_nqueues(struct net *net) |
88 | { | 88 | { |
89 | return ip6_frags.nqueues; | 89 | return net->ipv6.frags.nqueues; |
90 | } | 90 | } |
91 | 91 | ||
92 | int ip6_frag_mem(void) | 92 | int ip6_frag_mem(void) |
@@ -690,6 +690,8 @@ static int ipv6_frags_init_net(struct net *net) | |||
690 | net->ipv6.sysctl.frags.timeout = IPV6_FRAG_TIMEOUT; | 690 | net->ipv6.sysctl.frags.timeout = IPV6_FRAG_TIMEOUT; |
691 | net->ipv6.sysctl.frags.secret_interval = 10 * 60 * HZ; | 691 | net->ipv6.sysctl.frags.secret_interval = 10 * 60 * HZ; |
692 | 692 | ||
693 | inet_frags_init_net(&net->ipv6.frags); | ||
694 | |||
693 | return ip6_frags_sysctl_register(net); | 695 | return ip6_frags_sysctl_register(net); |
694 | } | 696 | } |
695 | 697 | ||