From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D8C72C282C3 for ; Tue, 22 Jan 2019 09:39:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B3029218D0 for ; Tue, 22 Jan 2019 09:39:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727869AbfAVJjb (ORCPT ); Tue, 22 Jan 2019 04:39:31 -0500 Received: from m9785.mail.qiye.163.com ([220.181.97.85]:58301 "EHLO m9785.mail.qiye.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727762AbfAVJja (ORCPT ); Tue, 22 Jan 2019 04:39:30 -0500 Received: from 10.19.61.167master (unknown [123.59.132.129]) by m9785.mail.qiye.163.com (Hmail) with ESMTPA id A55915C16EC; Tue, 22 Jan 2019 17:39:27 +0800 (CST) From: wenxu@ucloud.cn To: davem@davemloft.net Cc: netdev@vger.kernel.org Subject: [PATCH net-next 3/4] ip_tunnel: Fix route fl4 init in ip_md_tunnel_xmit Date: Tue, 22 Jan 2019 17:39:23 +0800 Message-Id: <1548149964-21299-4-git-send-email-wenxu@ucloud.cn> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548149964-21299-1-git-send-email-wenxu@ucloud.cn> References: <1548149964-21299-1-git-send-email-wenxu@ucloud.cn> X-HM-Spam-Status: e1kIGBQJHllBS1VLV1koWUFJQjdXWS1ZQUlXWQkOFx4IWUFZMjUtOjcyP0 FLVUtZBg++ X-HM-Sender-Digest: e1kMHhlZQR0aFwgeV1kSHx4VD1lBWUc6K0k6Ljo5STlJKx01SCkdSxQf GU0wFCNVSlVKTk9DSk9CQk1MTEpPVTMWGhIXVQweFQMOOw4YFxQOH1UYFUVZV1kSC1lBWUpJSFVO QlVKSElVSklCWVdZCAFZQUpDT0g3Bg++ X-HM-Tid: 0a6874edcb442087kuqya55915c16ec Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: wenxu 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 --- net/ipv4/ip_tunnel.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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; -- 1.8.3.1