diff options
Diffstat (limited to 'net/ipv4')
-rw-r--r-- | net/ipv4/inet_fragment.c | 1 | ||||
-rw-r--r-- | net/ipv4/ip_fragment.c | 5 | ||||
-rw-r--r-- | net/ipv4/proc.c | 5 |
3 files changed, 3 insertions, 8 deletions
diff --git a/net/ipv4/inet_fragment.c b/net/ipv4/inet_fragment.c index 43315ecb9400..231ca0b40811 100644 --- a/net/ipv4/inet_fragment.c +++ b/net/ipv4/inet_fragment.c | |||
@@ -193,7 +193,6 @@ EXPORT_SYMBOL(inet_frags_init); | |||
193 | 193 | ||
194 | void inet_frags_init_net(struct netns_frags *nf) | 194 | void inet_frags_init_net(struct netns_frags *nf) |
195 | { | 195 | { |
196 | nf->nqueues = 0; | ||
197 | init_frag_mem_limit(nf); | 196 | init_frag_mem_limit(nf); |
198 | INIT_LIST_HEAD(&nf->lru_list); | 197 | INIT_LIST_HEAD(&nf->lru_list); |
199 | spin_lock_init(&nf->lru_lock); | 198 | spin_lock_init(&nf->lru_lock); |
diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c index 54bd170c5eb4..1f42c2e3966b 100644 --- a/net/ipv4/ip_fragment.c +++ b/net/ipv4/ip_fragment.c | |||
@@ -86,11 +86,6 @@ static inline u8 ip4_frag_ecn(u8 tos) | |||
86 | 86 | ||
87 | static struct inet_frags ip4_frags; | 87 | static struct inet_frags ip4_frags; |
88 | 88 | ||
89 | int ip_frag_nqueues(struct net *net) | ||
90 | { | ||
91 | return net->ipv4.frags.nqueues; | ||
92 | } | ||
93 | |||
94 | int ip_frag_mem(struct net *net) | 89 | int ip_frag_mem(struct net *net) |
95 | { | 90 | { |
96 | return sum_frag_mem_limit(&net->ipv4.frags); | 91 | return sum_frag_mem_limit(&net->ipv4.frags); |
diff --git a/net/ipv4/proc.c b/net/ipv4/proc.c index ae0af9386f7c..8e3eb39f84e7 100644 --- a/net/ipv4/proc.c +++ b/net/ipv4/proc.c | |||
@@ -52,6 +52,7 @@ | |||
52 | static int sockstat_seq_show(struct seq_file *seq, void *v) | 52 | static int sockstat_seq_show(struct seq_file *seq, void *v) |
53 | { | 53 | { |
54 | struct net *net = seq->private; | 54 | struct net *net = seq->private; |
55 | unsigned int frag_mem; | ||
55 | int orphans, sockets; | 56 | int orphans, sockets; |
56 | 57 | ||
57 | local_bh_disable(); | 58 | local_bh_disable(); |
@@ -71,8 +72,8 @@ static int sockstat_seq_show(struct seq_file *seq, void *v) | |||
71 | sock_prot_inuse_get(net, &udplite_prot)); | 72 | sock_prot_inuse_get(net, &udplite_prot)); |
72 | seq_printf(seq, "RAW: inuse %d\n", | 73 | seq_printf(seq, "RAW: inuse %d\n", |
73 | sock_prot_inuse_get(net, &raw_prot)); | 74 | sock_prot_inuse_get(net, &raw_prot)); |
74 | seq_printf(seq, "FRAG: inuse %d memory %d\n", | 75 | frag_mem = ip_frag_mem(net); |
75 | ip_frag_nqueues(net), ip_frag_mem(net)); | 76 | seq_printf(seq, "FRAG: inuse %u memory %u\n", !!frag_mem, frag_mem); |
76 | return 0; | 77 | return 0; |
77 | } | 78 | } |
78 | 79 | ||