[PATCH]IPv6: Delete redundant counter of IPSTATS_MIB_REASMFAILS

[PATCH]IPv6: Delete redundant counter of IPSTATS_MIB_REASMFAILS

[Shan Wei]

When no more memory can be allocated, fq_find() will return NULL and 
increase the value of IPSTATS_MIB_REASMFAILS. In this case,
ipv6_frag_rcv() also increase the value of IPSTATS_MIB_REASMFAILS.

So, the patch deletes redundant counter of IPSTATS_MIB_REASMFAILS in fq_find().
and deletes the unused parameter of idev.


Signed-off-by: Shan Wei <shanwei@cn.fujitsu.com>
---
 net/ipv6/reassembly.c |   13 ++++---------
 1 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
index 2cddea3..01a996f 100644
--- a/net/ipv6/reassembly.c
+++ b/net/ipv6/reassembly.c
@@ -237,8 +237,7 @@ out:
 }
 
 static __inline__ struct frag_queue *
-fq_find(struct net *net, __be32 id, struct in6_addr *src, struct in6_addr *dst,
-	struct inet6_dev *idev)
+fq_find(struct net *net, __be32 id, struct in6_addr *src, struct in6_addr *dst)
 {
 	struct inet_frag_queue *q;
 	struct ip6_create_arg arg;
@@ -254,13 +253,9 @@ fq_find(struct net *net, __be32 id, struct in6_addr *src, struct in6_addr *dst,
 
 	q = inet_frag_find(&net->ipv6.frags, &ip6_frags, &arg, hash);
 	if (q == NULL)
-		goto oom;
+		return NULL;
 
 	return container_of(q, struct frag_queue, q);
-
-oom:
-	IP6_INC_STATS_BH(net, idev, IPSTATS_MIB_REASMFAILS);
-	return NULL;
 }
 
 static int ip6_frag_queue(struct frag_queue *fq, struct sk_buff *skb,
@@ -606,8 +601,8 @@ static int ipv6_frag_rcv(struct sk_buff *skb)
 	if (atomic_read(&net->ipv6.frags.mem) > net->ipv6.frags.high_thresh)
 		ip6_evictor(net, ip6_dst_idev(skb_dst(skb)));
 
-	if ((fq = fq_find(net, fhdr->identification, &hdr->saddr, &hdr->daddr,
-			  ip6_dst_idev(skb_dst(skb)))) != NULL) {
+	fq = fq_find(net, fhdr->identification, &hdr->saddr, &hdr->daddr);
+	if (fq != NULL) {
 		int ret;
 
 		spin_lock(&fq->q.lock);
-- 
1.6.3.3

Re: [PATCH]IPv6: Delete redundant counter of IPSTATS_MIB_REASMFAILS

[David Miller]

From: Shan Wei <shanwei@cn.fujitsu.com>
Date: Thu, 11 Feb 2010 18:12:45 +0800

> 
> When no more memory can be allocated, fq_find() will return NULL and 
> increase the value of IPSTATS_MIB_REASMFAILS. In this case,
> ipv6_frag_rcv() also increase the value of IPSTATS_MIB_REASMFAILS.
> 
> So, the patch deletes redundant counter of IPSTATS_MIB_REASMFAILS in fq_find().
> and deletes the unused parameter of idev.
> 
> 
> Signed-off-by: Shan Wei <shanwei@cn.fujitsu.com>

Applied to net-next-2.6, thanks.