From patchwork Tue Aug 2 11:13:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias May X-Patchwork-Id: 12934559 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CAE50C00140 for ; Tue, 2 Aug 2022 11:46:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233939AbiHBLqZ (ORCPT ); Tue, 2 Aug 2022 07:46:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42822 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235854AbiHBLqY (ORCPT ); Tue, 2 Aug 2022 07:46:24 -0400 Received: from mx07-0057a101.pphosted.com (mx07-0057a101.pphosted.com [205.220.184.10]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CADC718E09; Tue, 2 Aug 2022 04:46:23 -0700 (PDT) Received: from pps.filterd (m0214197.ppops.net [127.0.0.1]) by mx07-0057a101.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 272AlwUb013562; Tue, 2 Aug 2022 13:13:40 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=westermo.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=12052020; bh=Qj7f8eQ7QpQGORu5fbsYBALfepwxw72bHVigT/CTuh8=; b=ovFEtCvwcc1Cm1Q7IEiNe7zNPKHs8UH8iOg0whwREFRugNEXD1/NiE4sfxXbkB1N7ZBs wh7N5FFBq9YJ3QRIkaQOcb3YD9LWhPd1NQ88gpbxwTJZhHyvot/PCExef1NOKSIld3hl UFFyCIdp+zBkPxQ+YqoSrbSv8SHmKfmMVUxHN3xnU4NpIgmi75UcDgQR4a5KNcImINqA 7Nurz5mSMwlAOH6HrijkLbTKkwtBrIuSspGBWYzjvFuUNEYR5x31WfmSFlW59QQ7T2mq CmRZgYYfjdvwnTdiKqzVF0PyVJMiOnX+2EfP+BW+Scky6K4VT3VIyD3ZoM3UY9CGlE7u PQ== Received: from mail.beijerelectronics.com ([195.67.87.131]) by mx07-0057a101.pphosted.com (PPS) with ESMTPS id 3hms0c2v0k-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Tue, 02 Aug 2022 13:13:40 +0200 Received: from Orpheus.westermo.com (172.29.101.13) by EX01GLOBAL.beijerelectronics.com (10.101.10.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.2375.17; Tue, 2 Aug 2022 13:13:34 +0200 From: Matthias May To: CC: , , , , , , , , , , , , , , , , , , , , , , Matthias May Subject: [PATCH net 1/4] geneve: do not use RT_TOS for IPv6 flowlabel Date: Tue, 2 Aug 2022 13:13:05 +0200 Message-ID: <20220802111308.1359887-2-matthias.may@westermo.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220802111308.1359887-1-matthias.may@westermo.com> References: <20220802111308.1359887-1-matthias.may@westermo.com> MIME-Version: 1.0 X-Originating-IP: [172.29.101.13] X-ClientProxiedBy: wsevst-s0023.westermo.com (192.168.130.120) To EX01GLOBAL.beijerelectronics.com (10.101.10.25) X-Proofpoint-GUID: nYwn2O9PudBvjx2F12Bg24sjXxd-g5e0 X-Proofpoint-ORIG-GUID: nYwn2O9PudBvjx2F12Bg24sjXxd-g5e0 Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org According to Guillaume Nault RT_TOS should never be used for IPv6. Fixes: 3a56f86f1be6a ("geneve: handle ipv6 priority like ipv4 tos") Signed-off-by: Matthias May --- drivers/net/geneve.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c index 4c380c06f178..e1a4480e6f17 100644 --- a/drivers/net/geneve.c +++ b/drivers/net/geneve.c @@ -877,8 +877,7 @@ static struct dst_entry *geneve_get_v6_dst(struct sk_buff *skb, use_cache = false; } - fl6->flowlabel = ip6_make_flowinfo(RT_TOS(prio), - info->key.label); + fl6->flowlabel = ip6_make_flowinfo(prio, info->key.label); dst_cache = (struct dst_cache *)&info->dst_cache; if (use_cache) { dst = dst_cache_get_ip6(dst_cache, &fl6->saddr);