From: David S. Miller <davem@davemloft.net>
Date: Tue, 24 Jan 2012 23:18:05 +0000 (-0500)
Subject: ipip: Fix bug added to ipip_tunnel_xmit().
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=658c8d964eb3cdb7e4230a59ba09c75a3359ee4a;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

ipip: Fix bug added to ipip_tunnel_xmit().

We can remove the rt_gateway == 0 check but we shouldn't
remove the 'dst' initialization too.

Noticed by Eric Dumazet.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
index 87c63b67f8ce..f84ebff5cdb0 100644
--- a/net/ipv4/ipip.c
+++ b/net/ipv4/ipip.c
@@ -454,6 +454,7 @@ static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)
 			dev->stats.tx_fifo_errors++;
 			goto tx_error;
 		}
+		dst = rt->rt_gateway;
 	}
 
 	rt = ip_route_output_ports(dev_net(dev), &fl4, NULL,