diff options
| author | Dmitry Popov <ixaphire@qrator.net> | 2014-06-06 21:19:21 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-06-11 08:35:52 +0200 |
| commit | 2346829e641b804ece9ac9298136b56d9567c278 (patch) | |
| tree | 4f10815236c30fbcd7da844848e5d421e34bb758 /net/ipv4/ipip.c | |
| parent | net: force a list_del() in unregister_netdevice_many() (diff) | |
| download | linux-2346829e641b804ece9ac9298136b56d9567c278.tar.xz linux-2346829e641b804ece9ac9298136b56d9567c278.zip | |
ipip, sit: fix ipv4_{update_pmtu,redirect} calls
ipv4_{update_pmtu,redirect} were called with tunnel's ifindex (t->dev is a
tunnel netdevice). It caused wrong route lookup and failure of pmtu update or
redirect. We should use the same ifindex that we use in ip_route_output_* in
*tunnel_xmit code. It is t->parms.link .
Signed-off-by: Dmitry Popov <ixaphire@qrator.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ipip.c')
| -rw-r--r-- | net/ipv4/ipip.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c index 812b18351462..09680ddbc677 100644 --- a/net/ipv4/ipip.c +++ b/net/ipv4/ipip.c @@ -149,13 +149,13 @@ static int ipip_err(struct sk_buff *skb, u32 info) if (type == ICMP_DEST_UNREACH && code == ICMP_FRAG_NEEDED) { ipv4_update_pmtu(skb, dev_net(skb->dev), info, - t->dev->ifindex, 0, IPPROTO_IPIP, 0); + t->parms.link, 0, IPPROTO_IPIP, 0); err = 0; goto out; } if (type == ICMP_REDIRECT) { - ipv4_redirect(skb, dev_net(skb->dev), t->dev->ifindex, 0, + ipv4_redirect(skb, dev_net(skb->dev), t->parms.link, 0, IPPROTO_IPIP, 0); err = 0; goto out; |