From 81b69c91769f8a67cd30275f317d20ec20e33ff5 Mon Sep 17 00:00:00 2001
From: Ben Greear <greearb@candelatech.com>
Date: Fri, 23 Sep 2011 13:11:01 +0000
Subject: [PATCH] --- yaml --- r: 264167 b: refs/heads/master c:
 67928c4041606f02725f3c95c4c0404e4532df1b h: refs/heads/master i:   264165:
 86e3ca8b556d58ba2b1ce844d72244e0aacbbada   264163:
 3aeae0ba185c92285a3b67c40d5f9457c30b7e92   264159:
 f2dc179c6d8400b244c69b62b2650561e2dd6c1e v: v3

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

diff --git a/[refs] b/[refs]
index 3e13c4b1e605..ba65d7964476 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fbe58186901155c0cb5398dd343337be0c456c04
+refs/heads/master: 67928c4041606f02725f3c95c4c0404e4532df1b
diff --git a/trunk/net/ipv6/ip6mr.c b/trunk/net/ipv6/ip6mr.c
index 825d02fa6586..def0538e2413 100644
--- a/trunk/net/ipv6/ip6mr.c
+++ b/trunk/net/ipv6/ip6mr.c
@@ -696,8 +696,10 @@ static netdev_tx_t reg_vif_xmit(struct sk_buff *skb,
 	int err;
 
 	err = ip6mr_fib_lookup(net, &fl6, &mrt);
-	if (err < 0)
+	if (err < 0) {
+		kfree_skb(skb);
 		return err;
+	}
 
 	read_lock(&mrt_lock);
 	dev->stats.tx_bytes += skb->len;