OSDN Git Service

ip_tunnel: Fix route fl4 init in ip_md_tunnel_xmit
authorwenxu <wenxu@ucloud.cn>
Tue, 22 Jan 2019 10:39:51 +0000 (18:39 +0800)
committerDavid S. Miller <davem@davemloft.net>
Sat, 26 Jan 2019 17:43:03 +0000 (09:43 -0800)
commit6e6b904ad4f9aed43ec320afbd5a52ed8461ab41
tree60620177f2f84d22cde04109fc48b6e8d6c12425
parentc8b34e680a090ab8dc42f8331020e31052b49a70
ip_tunnel: Fix route fl4 init in ip_md_tunnel_xmit

Init the gre_key from tuninfo->key.tun_id and init the mark
from the skb->mark, set the oif to zero in the collect metadata
mode.

Fixes: cfc7381b3002 ("ip_tunnel: add collect_md mode to IPIP tunnel")
Signed-off-by: wenxu <wenxu@ucloud.cn>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/ip_tunnel.c