| Message ID | 20120124.181838.1470195215432711102.davem@davemloft.net |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
Le mardi 24 janvier 2012 à 18:18 -0500, David Miller a écrit : > 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 | 1 + > 1 files changed, 1 insertions(+), 0 deletions(-) > > diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c > index 87c63b6..f84ebff 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, Well, a similar fix is needed for net/ipv4/ip_gre.c :) (Its a bit late here, time for a sleep for me) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c index 87c63b6..f84ebff 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,
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 | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)