From 01d51e6368638867938e4711d95f5226123158f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= <ilpo.jarvinen@helsinki.fi>
Date: Fri, 6 Feb 2009 23:46:51 -0800
Subject: [PATCH] --- yaml --- r: 134314 b: refs/heads/master c:
 69ebbf58f3dff9fb4e5240e472b5869fa869dae1 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index b7a18b5a7e77..bfd53125c738 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 12207e498b9b8f9f0c946db079ad17c7ca16cdf3
+refs/heads/master: 69ebbf58f3dff9fb4e5240e472b5869fa869dae1
diff --git a/trunk/net/ipv4/ipmr.c b/trunk/net/ipv4/ipmr.c
index 21a6dc710f20..13e9dd3012b3 100644
--- a/trunk/net/ipv4/ipmr.c
+++ b/trunk/net/ipv4/ipmr.c
@@ -1243,8 +1243,7 @@ static void ipmr_queue_xmit(struct sk_buff *skb, struct mfc_cache *c, int vifi)
 		vif->dev->stats.tx_bytes += skb->len;
 		vif->dev->stats.tx_packets++;
 		ipmr_cache_report(net, skb, vifi, IGMPMSG_WHOLEPKT);
-		kfree_skb(skb);
-		return;
+		goto out_free;
 	}
 #endif