From 430c0367c8e38f6887cc2b4680b0d1a516a215bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= <ilpo.jarvinen@helsinki.fi>
Date: Sun, 14 Dec 2008 23:15:49 -0800
Subject: [PATCH] --- yaml --- r: 122699 b: refs/heads/master c:
 8da73b73ef29d537ba09f29393cd68707833e746 h: refs/heads/master i:   122697:
 6136809252f5ff7e297e532af7b27e0d2c4acc7c   122695:
 55c924469bdc8f089f454072c9521faa91f341e7 v: v3

---
 [refs]                 | 2 +-
 trunk/net/ipv6/ip6mr.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index bf90c0792d79..6f9c08917e3e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 448eb71f40120a8fd11ebd58153c271c63e6f862
+refs/heads/master: 8da73b73ef29d537ba09f29393cd68707833e746
diff --git a/trunk/net/ipv6/ip6mr.c b/trunk/net/ipv6/ip6mr.c
index 9eed2422b3e3..3c51b2d827f4 100644
--- a/trunk/net/ipv6/ip6mr.c
+++ b/trunk/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