projects
/
GitHub
/
MotorolaMobilityLLC
/
kernel-slsi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
496053f
)
ipip: Fix bug added to ipip_tunnel_xmit().
author
David S. Miller
<davem@davemloft.net>
Tue, 24 Jan 2012 23:18:05 +0000
(18:18 -0500)
committer
David S. Miller
<davem@davemloft.net>
Tue, 24 Jan 2012 23:18:05 +0000
(18:18 -0500)
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>
net/ipv4/ipip.c
patch
|
blob
|
blame
|
history
diff --git
a/net/ipv4/ipip.c
b/net/ipv4/ipip.c
index 87c63b67f8ce8aacf7f359cc0d87579a51cd0739..f84ebff5cdb00a028e89ba7f77f736227107fc1a 100644
(file)
--- 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,