From 11746155f1f3ab3e8583434ae531e13ded9e9bb5 Mon Sep 17 00:00:00 2001
From: Tommi Rantala <tt.rantala@gmail.com>
Date: Wed, 6 Feb 2013 03:24:02 +0000
Subject: [PATCH] --- yaml --- r: 349670 b: refs/heads/master c:
 41ab3e31bd50b42c85ac0aa0469642866aee2a9a h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 6a1e726a6c27..d4d05fae4f4e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6731d2095bd4aef18027c72ef845ab1087c3ba63
+refs/heads/master: 41ab3e31bd50b42c85ac0aa0469642866aee2a9a
diff --git a/trunk/net/ipv6/ip6_gre.c b/trunk/net/ipv6/ip6_gre.c
index c727e4712751..131dd097736d 100644
--- a/trunk/net/ipv6/ip6_gre.c
+++ b/trunk/net/ipv6/ip6_gre.c
@@ -960,7 +960,7 @@ static netdev_tx_t ip6gre_tunnel_xmit(struct sk_buff *skb,
 	int ret;
 
 	if (!ip6_tnl_xmit_ctl(t))
-		return -1;
+		goto tx_err;
 
 	switch (skb->protocol) {
 	case htons(ETH_P_IP):