summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-01-24 18:18:05 -0500
committerDavid S. Miller <davem@davemloft.net>2012-01-24 18:18:05 -0500
commit658c8d964eb3cdb7e4230a59ba09c75a3359ee4a (patch)
treee8808141e0c266a53944892785e55223f0f4dd26
parent496053f488fc2d859e41574f3421993826d2d0eb (diff)
downloadlinux-stable-658c8d964eb3cdb7e4230a59ba09c75a3359ee4a.tar.gz
linux-stable-658c8d964eb3cdb7e4230a59ba09c75a3359ee4a.tar.bz2
linux-stable-658c8d964eb3cdb7e4230a59ba09c75a3359ee4a.zip
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>
-rw-r--r--net/ipv4/ipip.c1
1 files changed, 1 insertions, 0 deletions
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,