---

yaml --- r: 349670 b: refs/heads/master c: 41ab3e3 h: refs/heads/master v: v3
git-mirror · Feb 6, 2013 · 1174615 · 1174615
1 parent 9baa145
commit 1174615
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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):