]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
ip_gre: remove an extra dst_release()
authorEric Dumazet <edumazet@google.com>
Tue, 19 Feb 2013 12:14:10 +0000 (12:14 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 20 Feb 2013 03:24:04 +0000 (22:24 -0500)
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>
net/ipv4/ip_gre.c

index 31bc9415269337f80ca6483069d99909e06675e6..5ef4da780ac1120f6e2ab8239b077f79c6720dc8 100644 (file)
@@ -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;