From: Eric Dumazet <edumazet@google.com>
Date: Tue, 19 Feb 2013 12:14:10 +0000 (+0000)
Subject: ip_gre: remove an extra dst_release()
X-Git-Tag: MMI-PSA29.97-13-9~15013^2~3
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=4aa896c4baaab2b4f499c7434f85457f9f3d9fe4;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

ip_gre: remove an extra dst_release()

commit 68c331631143 (v4 GRE: Add TCP segmentation offload for GRE)
introduced a bug in error path.

dst is attached to skb, so will be released when skb is freed.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Pravin B Shelar <pshelar@nicira.com>
Acked-by: Pravin B Shelar <pshelar@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index 31bc94152693..5ef4da780ac1 100644
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -1006,10 +1006,8 @@ static netdev_tx_t ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev
 
 			if (skb_has_shared_frag(skb)) {
 				err = __skb_linearize(skb);
-				if (err) {
-					ip_rt_put(rt);
+				if (err)
 					goto tx_error;
-				}
 			}
 
 			*ptr = 0;