From 30960f37298d48a3fc9f91d8dfaa76acd86975aa Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Tue, 19 Feb 2013 12:14:10 +0000 Subject: [PATCH] --- yaml --- r: 352800 b: refs/heads/master c: 4aa896c4baaab2b4f499c7434f85457f9f3d9fe4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/ipv4/ip_gre.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a7ebf6239c21..e4591ac1f8c9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 303c07db487be59ae9fda10600ea65ca11c21497 +refs/heads/master: 4aa896c4baaab2b4f499c7434f85457f9f3d9fe4 diff --git a/trunk/net/ipv4/ip_gre.c b/trunk/net/ipv4/ip_gre.c index 31bc94152693..5ef4da780ac1 100644 --- a/trunk/net/ipv4/ip_gre.c +++ b/trunk/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;