diff options
| author | David S. Miller <davem@davemloft.net> | 2012-01-24 18:23:30 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-01-24 18:23:30 -0500 |
| commit | 61d57f87f3fb04a305f22befabd042ffbec8b852 (patch) | |
| tree | ef0596f29c69f50dc2fed1bbc9bf9cfcd879cdd7 /net/ipv4 | |
| parent | 658c8d964eb3cdb7e4230a59ba09c75a3359ee4a (diff) | |
| download | linux-3.10-61d57f87f3fb04a305f22befabd042ffbec8b852.tar.gz linux-3.10-61d57f87f3fb04a305f22befabd042ffbec8b852.tar.bz2 linux-3.10-61d57f87f3fb04a305f22befabd042ffbec8b852.zip | |
ip_gre: Fix bug added to ipgre_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>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/ip_gre.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index fc213350a6e..05f7419ed7c 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c @@ -724,8 +724,10 @@ static netdev_tx_t ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev goto tx_error; } - if (skb->protocol == htons(ETH_P_IP)) + if (skb->protocol == htons(ETH_P_IP)) { rt = skb_rtable(skb); + dst = rt->rt_gateway; + } #if IS_ENABLED(CONFIG_IPV6) else if (skb->protocol == htons(ETH_P_IPV6)) { struct neighbour *neigh = dst_get_neighbour_noref(skb_dst(skb)); |