diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/ipv4/inet_fragment.c | 11 | ||||
-rw-r--r-- | net/ipv4/ip_fragment.c | 6 | ||||
-rw-r--r-- | net/ipv4/proc.c | 2 | ||||
-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 |
6 files changed, 19 insertions, 9 deletions
diff --git a/net/ipv4/inet_fragment.c b/net/ipv4/inet_fragment.c index 158c5f60d023..4fec0b911f85 100644 --- a/net/ipv4/inet_fragment.c +++ b/net/ipv4/inet_fragment.c | |||
@@ -63,7 +63,6 @@ void inet_frags_init(struct inet_frags *f) | |||
63 | f->rnd = (u32) ((num_physpages ^ (num_physpages>>7)) ^ | 63 | f->rnd = (u32) ((num_physpages ^ (num_physpages>>7)) ^ |
64 | (jiffies ^ (jiffies >> 6))); | 64 | (jiffies ^ (jiffies >> 6))); |
65 | 65 | ||
66 | f->nqueues = 0; | ||
67 | atomic_set(&f->mem, 0); | 66 | atomic_set(&f->mem, 0); |
68 | 67 | ||
69 | setup_timer(&f->secret_timer, inet_frag_secret_rebuild, | 68 | setup_timer(&f->secret_timer, inet_frag_secret_rebuild, |
@@ -73,6 +72,12 @@ void inet_frags_init(struct inet_frags *f) | |||
73 | } | 72 | } |
74 | EXPORT_SYMBOL(inet_frags_init); | 73 | EXPORT_SYMBOL(inet_frags_init); |
75 | 74 | ||
75 | void inet_frags_init_net(struct netns_frags *nf) | ||
76 | { | ||
77 | nf->nqueues = 0; | ||
78 | } | ||
79 | EXPORT_SYMBOL(inet_frags_init_net); | ||
80 | |||
76 | void inet_frags_fini(struct inet_frags *f) | 81 | void inet_frags_fini(struct inet_frags *f) |
77 | { | 82 | { |
78 | del_timer(&f->secret_timer); | 83 | del_timer(&f->secret_timer); |
@@ -84,7 +89,7 @@ static inline void fq_unlink(struct inet_frag_queue *fq, struct inet_frags *f) | |||
84 | write_lock(&f->lock); | 89 | write_lock(&f->lock); |
85 | hlist_del(&fq->list); | 90 | hlist_del(&fq->list); |
86 | list_del(&fq->lru_list); | 91 | list_del(&fq->lru_list); |
87 | f->nqueues--; | 92 | fq->net->nqueues--; |
88 | write_unlock(&f->lock); | 93 | write_unlock(&f->lock); |
89 | } | 94 | } |
90 | 95 | ||
@@ -206,7 +211,7 @@ static struct inet_frag_queue *inet_frag_intern(struct netns_frags *nf, | |||
206 | atomic_inc(&qp->refcnt); | 211 | atomic_inc(&qp->refcnt); |
207 | hlist_add_head(&qp->list, &f->hash[hash]); | 212 | hlist_add_head(&qp->list, &f->hash[hash]); |
208 | list_add_tail(&qp->lru_list, &f->lru_list); | 213 | list_add_tail(&qp->lru_list, &f->lru_list); |
209 | f->nqueues++; | 214 | nf->nqueues++; |
210 | write_unlock(&f->lock); | 215 | write_unlock(&f->lock); |
211 | return qp; | 216 | return qp; |
212 | } | 217 | } |
diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c index 56211ef46eed..cd8c83025b48 100644 --- a/net/ipv4/ip_fragment.c +++ b/net/ipv4/ip_fragment.c | |||
@@ -95,9 +95,9 @@ static struct inet_frags_ctl ip4_frags_ctl __read_mostly = { | |||
95 | 95 | ||
96 | static struct inet_frags ip4_frags; | 96 | static struct inet_frags ip4_frags; |
97 | 97 | ||
98 | int ip_frag_nqueues(void) | 98 | int ip_frag_nqueues(struct net *net) |
99 | { | 99 | { |
100 | return ip4_frags.nqueues; | 100 | return net->ipv4.frags.nqueues; |
101 | } | 101 | } |
102 | 102 | ||
103 | int ip_frag_mem(void) | 103 | int ip_frag_mem(void) |
@@ -675,6 +675,8 @@ static inline int ip4_frags_ctl_register(struct net *net) | |||
675 | 675 | ||
676 | static int ipv4_frags_init_net(struct net *net) | 676 | static int ipv4_frags_init_net(struct net *net) |
677 | { | 677 | { |
678 | inet_frags_init_net(&net->ipv4.frags); | ||
679 | |||
678 | return ip4_frags_ctl_register(net); | 680 | return ip4_frags_ctl_register(net); |
679 | } | 681 | } |
680 | 682 | ||
diff --git a/net/ipv4/proc.c b/net/ipv4/proc.c index cb3787fbeb90..bae32808616e 100644 --- a/net/ipv4/proc.c +++ b/net/ipv4/proc.c | |||
@@ -62,7 +62,7 @@ static int sockstat_seq_show(struct seq_file *seq, void *v) | |||
62 | seq_printf(seq, "UDPLITE: inuse %d\n", sock_prot_inuse_get(&udplite_prot)); | 62 | seq_printf(seq, "UDPLITE: inuse %d\n", sock_prot_inuse_get(&udplite_prot)); |
63 | seq_printf(seq, "RAW: inuse %d\n", sock_prot_inuse_get(&raw_prot)); | 63 | seq_printf(seq, "RAW: inuse %d\n", sock_prot_inuse_get(&raw_prot)); |
64 | seq_printf(seq, "FRAG: inuse %d memory %d\n", | 64 | seq_printf(seq, "FRAG: inuse %d memory %d\n", |
65 | ip_frag_nqueues(), ip_frag_mem()); | 65 | ip_frag_nqueues(&init_net), ip_frag_mem()); |
66 | return 0; | 66 | return 0; |
67 | } | 67 | } |
68 | 68 | ||
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 | ||