From: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Date: Mon, 15 Dec 2008 07:15:49 +0000 (-0800)
Subject: ip6mr: use goto to common label instead of opencoding
X-Git-Tag: v2.6.29-rc1~581^2~196
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=8da73b73ef29d537ba09f29393cd68707833e746;p=linux-2.6-omap-h63xx.git

ip6mr: use goto to common label instead of opencoding

Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c
index 9eed2422b3e..3c51b2d827f 100644
--- a/net/ipv6/ip6mr.c
+++ b/net/ipv6/ip6mr.c
@@ -1501,8 +1501,7 @@ static int ip6mr_forward2(struct sk_buff *skb, struct mfc6_cache *c, int vifi)
 		vif->dev->stats.tx_bytes += skb->len;
 		vif->dev->stats.tx_packets++;
 		ip6mr_cache_report(net, skb, vifi, MRT6MSG_WHOLEPKT);
-		kfree_skb(skb);
-		return 0;
+		goto out_free;
 	}
 #endif