Received: by 2002:ac0:e350:0:0:0:0:0 with SMTP id g16csp2474749imn; Tue, 2 Aug 2022 04:21:43 -0700 (PDT) X-Google-Smtp-Source: AA6agR7zqmP7wmGBauLgki8ynEggHOE9Q/uX0wFou/zmh8eIZVniT+CHRMA09VTYjtq8S9zMoA5m X-Received: by 2002:a05:6402:40c9:b0:43d:cc0d:e9de with SMTP id z9-20020a05640240c900b0043dcc0de9demr6473084edb.319.1659439303362; Tue, 02 Aug 2022 04:21:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659439303; cv=none; d=google.com; s=arc-20160816; b=cU+QRBZzc2Kv1BpBrxeqogFpyBbglH8CnXGcSmnNhGdXa2uMp8x/tzGIwsqcHWntdH 5DCzxNLawrugdCehO0ainRfdOXGMnNZ0nSBecfKIUXxMZ7K96QUHKH+TNbgYsT0Jh5j+ m3rs+pXQ0T7gdx82wQH7wVxNmWrEZyAVzNJh++cm5tUTvCvnp4fPll0Wip0b9Z9YJ6ar I0oE4A4Q4GEGJPFJi3UsNKhSA3bZcDUP0AQGhW7/by3Vs7DZfASB4D4Mr1YXpu3uArCi tQA+Wu7egKaV1iQx5DjLOvvruaWvVPV8DjcYmwGnOIkBTauZotsd08cKJWRE2NfRYaSf cydg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=s0sAH8Va4oVwM9bds8xjXKdGoYvKULeCnqytXxV4qlc=; b=iPpgc6z/9oaL+wnTMQE2EqWEqc1UQ8xgtK0TsUf/uJdCMyOzX4ep+NcT87ctUjPwir kcurf6Prd7cUq0JeP93pVCFqlpL0Lb+cxF9cNuFnhH6a1DBQvOVR3U0fDPhUpPu2Me8q GDCc160j+euxSbA0Nc1BkH7GhaPWw7exOy3Lpsr5Gkc91smHcDVPFZSZkG92zK0Bz0CU Se5DFdhv5tfUk+Y7y8+wMRKyhcHDLTlS+e8oh+i18yy/QuOz5/jaJyrMZbgA6s3Hl6rH V3/rHqXUHN4wnMG5IYawxCJuogWirpl9+Pk5FSEC9QJHpOFp0PuRzFuZyn1PJMh82BKY wjhw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@westermo.com header.s=12052020 header.b=2C9dKWqO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=westermo.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id cy12-20020a0564021c8c00b0043565c5a2fbsi11008400edb.89.2022.08.02.04.21.18; Tue, 02 Aug 2022 04:21:43 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@westermo.com header.s=12052020 header.b=2C9dKWqO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=westermo.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236884AbiHBLO3 (ORCPT + 99 others); Tue, 2 Aug 2022 07:14:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47994 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236864AbiHBLO0 (ORCPT ); Tue, 2 Aug 2022 07:14:26 -0400 Received: from mx07-0057a101.pphosted.com (mx07-0057a101.pphosted.com [205.220.184.10]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 592A12B193; Tue, 2 Aug 2022 04:14:18 -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 27275Q7L026303; Tue, 2 Aug 2022 13:13:44 +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=s0sAH8Va4oVwM9bds8xjXKdGoYvKULeCnqytXxV4qlc=; b=2C9dKWqOfJyjZErAq5w2BIdsx6gbaRvgJ1S6g9qaYiN+C0qXm3O6ik1RtyQynJEF+2+T QTQMsqjAzGVSGp0dEaCoSQKtI4MNJdT93PsXMgqecDByUL4IXJge7MidjM8GPPehEqE2 CBQYwOEBv33BXffQxIsOWy4HAT3U6WblyY+NxzSh/DCkNUvjoI9gXzrn1J4+v7eOKwh8 YnIaJ8MBQ32nKgVU+ZJQJ3bXro9huFWxILyacJV2iYoctlxRmK2ukcLUPDRT2NnWAUSh r1qMowoYCbIA+zflmU5tmR3kvrgGj9Ylzg7j9uIwJ6uXlf/CLkn6+jCRzAhDNzGOEswN +A== Received: from mail.beijerelectronics.com ([195.67.87.131]) by mx07-0057a101.pphosted.com (PPS) with ESMTPS id 3hms0c2v0p-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Tue, 02 Aug 2022 13:13:44 +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:42 +0200 From: Matthias May To: CC: , , , , , , , , , , , , , , , , , , , , , , Matthias May Subject: [PATCH net 4/4] ipv6: do not use RT_TOS for IPv6 flowlabel Date: Tue, 2 Aug 2022 13:13:08 +0200 Message-ID: <20220802111308.1359887-5-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 Content-Transfer-Encoding: 8bit Content-Type: text/plain 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: FkHXf2mzz-Ak5yeVUdjlC1xlaQTArItR X-Proofpoint-ORIG-GUID: FkHXf2mzz-Ak5yeVUdjlC1xlaQTArItR X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org According to Guillaume Nault RT_TOS should never be used for IPv6. Fixes: 571912c69f0e ("net: UDP tunnel encapsulation module for tunnelling different protocols like MPLS, IP, NSH etc.") Signed-off-by: Matthias May --- net/ipv6/ip6_output.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index 77e3f5970ce4..ec62f472aa1c 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -1311,8 +1311,7 @@ struct dst_entry *ip6_dst_lookup_tunnel(struct sk_buff *skb, fl6.daddr = info->key.u.ipv6.dst; fl6.saddr = info->key.u.ipv6.src; prio = info->key.tos; - fl6.flowlabel = ip6_make_flowinfo(RT_TOS(prio), - info->key.label); + fl6.flowlabel = ip6_make_flowinfo(prio, info->key.label); dst = ipv6_stub->ipv6_dst_lookup_flow(net, sock->sk, &fl6, NULL); -- 2.35.1