From: wenxu Date: Sat, 19 Jan 2019 05:11:25 +0000 (+0800) Subject: ip_tunnel: Make none-tunnel-dst tunnel port work with lwtunnel X-Git-Tag: Ubuntu-4.15.0-87.87~907 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=804b9328c3b5a7ec8b5c0dfc327e879243e7e0b8;p=mirror_ubuntu-bionic-kernel.git ip_tunnel: Make none-tunnel-dst tunnel port work with lwtunnel BugLink: https://bugs.launchpad.net/bugs/1855787 [ Upstream commit d71b57532d70c03f4671dd04e84157ac6bf021b0 ] ip l add dev tun type gretap key 1000 ip a a dev tun 10.0.0.1/24 Packets with tun-id 1000 can be recived by tun dev. But packet can't be sent through dev tun for non-tunnel-dst With this patch: tunnel-dst can be get through lwtunnel like beflow: ip r a 10.0.0.7 encap ip dst 172.168.0.11 dev tun Signed-off-by: wenxu Signed-off-by: David S. Miller Signed-off-by: Sasha Levin Signed-off-by: Kamal Mostafa Signed-off-by: Kleber Sacilotto de Souza --- diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c index 52814f3ffb01..7150d9cba4a0 100644 --- a/net/ipv4/ip_tunnel.c +++ b/net/ipv4/ip_tunnel.c @@ -652,13 +652,19 @@ void ip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev, dst = tnl_params->daddr; if (dst == 0) { /* NBMA tunnel */ + struct ip_tunnel_info *tun_info; if (!skb_dst(skb)) { dev->stats.tx_fifo_errors++; goto tx_error; } - if (skb->protocol == htons(ETH_P_IP)) { + tun_info = skb_tunnel_info(skb); + if (tun_info && (tun_info->mode & IP_TUNNEL_INFO_TX) && + ip_tunnel_info_af(tun_info) == AF_INET && + tun_info->key.u.ipv4.dst) + dst = tun_info->key.u.ipv4.dst; + else if (skb->protocol == htons(ETH_P_IP)) { rt = skb_rtable(skb); dst = rt_nexthop(rt, inner_iph->daddr); }