[PATCH] [IGMP]: Optimize kfree_skb in igmp_rcv.

[PATCH] [IGMP]: Optimize kfree_skb in igmp_rcv.

[Denis V. Lunev]

Merge error paths inside igmp_rcv.

Signed-off-by: Denis V. Lunev <den@openvz.org>
---
 net/ipv4/igmp.c |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c
index fe2e6cd..d3f34a7 100644
--- a/net/ipv4/igmp.c
+++ b/net/ipv4/igmp.c
@@ -922,13 +922,11 @@ int igmp_rcv(struct sk_buff *skb)
 	struct in_device *in_dev = in_dev_get(skb->dev);
 	int len = skb->len;
 
-	if (in_dev==NULL) {
-		kfree_skb(skb);
-		return 0;
-	}
+	if (in_dev == NULL)
+		goto drop;
 
 	if (!pskb_may_pull(skb, sizeof(struct igmphdr)))
-		goto drop;
+		goto drop_ref;
 
 	switch (skb->ip_summed) {
 	case CHECKSUM_COMPLETE:
@@ -938,7 +936,7 @@ int igmp_rcv(struct sk_buff *skb)
 	case CHECKSUM_NONE:
 		skb->csum = 0;
 		if (__skb_checksum_complete(skb))
-			goto drop;
+			goto drop_ref;
 	}
 
 	ih = igmp_hdr(skb);
@@ -972,8 +970,9 @@ int igmp_rcv(struct sk_buff *skb)
 		break;
 	}
 
-drop:
+drop_ref:
 	in_dev_put(in_dev);
+drop:
 	kfree_skb(skb);
 	return 0;
 }
-- 
1.5.3.rc5

Re: [PATCH] [IGMP]: Optimize kfree_skb in igmp_rcv.

[David Miller]

From: "Denis V. Lunev" <den@openvz.org>
Date: Fri,  8 Feb 2008 17:14:17 +0300

> Merge error paths inside igmp_rcv.
> 
> Signed-off-by: Denis V. Lunev <den@openvz.org>

Applied, but this kind of cleanup is borderline during this
time period.  Please queue such things up for when I open up
net-2.6.26, thanks.

Find some bugs to fix instead :-)