From 4290d70996c425da860f6c3b9c328a3f9dd495d3 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Tue, 24 Jan 2012 18:18:05 -0500
Subject: [PATCH] --- yaml --- r: 289727 b: refs/heads/master c:
 658c8d964eb3cdb7e4230a59ba09c75a3359ee4a h: refs/heads/master i:   289725:
 f0f70a09f4ce04c079949c7798d3f1b182adc058   289723:
 7666425d0f145c19d5dafe13c0d53aa66554adec   289719:
 70350a27dffa98d254cdb9208b7bb3ff5376b095   289711:
 4bd427f686784428869e7846ba7fe27a09ceb165   289695:
 ff34395980661f178a286741d459ff6dfb64488d   289663:
 bc9c1a20c1363a1fd587b9c4dfb583b244134c2d v: v3

---
 [refs]                | 2 +-
 trunk/net/ipv4/ipip.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f2165843c161..6e24d091fea0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 496053f488fc2d859e41574f3421993826d2d0eb
+refs/heads/master: 658c8d964eb3cdb7e4230a59ba09c75a3359ee4a
diff --git a/trunk/net/ipv4/ipip.c b/trunk/net/ipv4/ipip.c
index 87c63b67f8ce..f84ebff5cdb0 100644
--- a/trunk/net/ipv4/ipip.c
+++ b/trunk/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,