From 0f6e5f472bd8c553f4778c8b90b12d23b3ac90ab Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Tue, 19 Feb 2013 22:24:50 -0500 Subject: [PATCH] --- yaml --- r: 352829 b: refs/heads/master c: c6b538079723efd21b5fd7e3091dc47dbd0436c4 h: refs/heads/master i: 352827: 48b3ff7ee506a2ce04e2459b9f9a9a8a9a49c026 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 6657f3cbf6fe..08d7a95c8034 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0b7164458fc184455239ea3676af1b362df1ce1d +refs/heads/master: c6b538079723efd21b5fd7e3091dc47dbd0436c4 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;