diff mbox series

[net-next,3/4] ip_tunnel: Fix route fl4 init in ip_md_tunnel_xmit

Message ID 1548149964-21299-4-git-send-email-wenxu@ucloud.cn
State Superseded
Delegated to: David Miller
Headers show
Series ip_tunnel: Refactor ip_gre collect metadata xmit to ip_md_tunnel_xmit | expand

Commit Message

wenxu Jan. 22, 2019, 9:39 a.m. UTC 
From: wenxu <wenxu@ucloud.cn>

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

Fixes: cfc7381 ("ip_tunnel: add collect_md mode to IPIP tunnel'")

Signed-off-by: wenxu <wenxu@ucloud.cn>
---
 net/ipv4/ip_tunnel.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

Sergei Shtylyov Jan. 22, 2019, 10:05 a.m. UTC | #1 
Hello!

On 01/22/2019 12:39 PM, wenxu@ucloud.cn wrote:

> From: wenxu <wenxu@ucloud.cn>
> 
> Init the gre_key from tuninfo->key.tun_id and init the mark
> from the skb->mark, set the oif zero in the collect metadata mode
> 
> Fixes: cfc7381 ("ip_tunnel: add collect_md mode to IPIP tunnel'")

   Need 12 digits for the commit ID. And why that apostrophe at
the end of summary?

> Signed-off-by: wenxu <wenxu@ucloud.cn>
[...]

MBR, Sergei
diff mbox series

Patch

diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c
index 6233a7c..3a15ee1 100644
--- a/net/ipv4/ip_tunnel.c
+++ b/net/ipv4/ip_tunnel.c
@@ -582,8 +582,9 @@  void ip_md_tunnel_xmit(struct sk_buff *skb, struct net_device *dev,
 		else if (skb->protocol == htons(ETH_P_IPV6))
 			tos = ipv6_get_dsfield((const struct ipv6hdr *)inner_iph);
 	}
-	ip_tunnel_init_flow(&fl4, proto, key->u.ipv4.dst, key->u.ipv4.src, 0,
-			    RT_TOS(tos), tunnel->parms.link, tunnel->fwmark);
+	ip_tunnel_init_flow(&fl4, proto, key->u.ipv4.dst, key->u.ipv4.src,
+			    tunnel_id_to_key32(key->tun_id), RT_TOS(tos),
+			    0, skb->mark);
 	if (tunnel->encap.type != TUNNEL_ENCAP_NONE)
 		goto tx_error;