Received: by 2002:a05:6a10:413:0:0:0:0 with SMTP id 19csp97714pxp; Wed, 16 Mar 2022 01:02:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzVTmasrdII4Zp7fQw2vA8vkmcVq83JQ9PPY6Lj4w+VOGOSn9kJiiZI/AbbizO203xEni0b X-Received: by 2002:a17:907:6e8d:b0:6d7:1261:d468 with SMTP id sh13-20020a1709076e8d00b006d71261d468mr26193173ejc.390.1647417752189; Wed, 16 Mar 2022 01:02:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647417752; cv=none; d=google.com; s=arc-20160816; b=SmkgqhyKXhatSVgscHYQS2PrWcYLNj3GsvGEnXd1kyvbyP9lI0YHkTv6/zx7JbWwdi ThPwFNNoMH1qe6cCwDA8S2xDBLcyHbo3Oy/O0n2hZhzi64/LIhvdRl2JgEVZrdY1DBZl DafrOdEmSJAoBO5vRrLYoWhlXHvkkmIwKN83eeBt0p4fQEJSETXHZVkzgi2cxgZzI9IS cxs0q7IfZW0mlAHPYKEeTEUVWdqyxPD2/MWr98VDqgnfzfop+//0Lnqo1F9pbTN2kE1p LBXUm9BIPZ/DSnpDer2Koh9MG/QgwzBetdC3F0ipdrT5FN1HW7Syj4IfT3Ms3mkKC4vb IAWw== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=p2VFkEyDc0jEm5FSr0d95rN0lYQwyIRdA0QFQ8+sLFI=; b=c0HnDbYOGmkkFawzT7I7/sLUYbE3ROA3NypmXRb5VU+4v9kifn+FiK75/V9jIvp6nl zCNHdEjowbvG16vpIeUc1/3fN0gAPyfgR/Cuoabjte91U6aXjQrjZTj4QKy1Go9Z1KzB rC6zm192tklWoNCe8kqhKMbiIFPWeyv7YxRgd56CzluR2HlFAluycr6kGeJlvgsQl5oB tYT72PY99wLXWxwj0I2lc7Yo3LRyhVJ5dwaDrJo/W4oicYgfzvOpYHBiY9RY8q7tlJsh eTld/wYNHTsIqU/jfOVBpl16YPv1z6AvcrkGXXkkTpIbym/tYvyBMP12fSfYdJ83zngZ fG4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=rPxJIz31; 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=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q14-20020a056402518e00b004162d0a6b6fsi876928edd.371.2022.03.16.01.02.03; Wed, 16 Mar 2022 01:02:32 -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=@linuxfoundation.org header.s=korg header.b=rPxJIz31; 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=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236270AbiCNMRk (ORCPT + 99 others); Mon, 14 Mar 2022 08:17:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55568 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242861AbiCNMLI (ORCPT ); Mon, 14 Mar 2022 08:11:08 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 40ECA32EFC; Mon, 14 Mar 2022 05:09:59 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id C7FF561314; Mon, 14 Mar 2022 12:09:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id ABCAFC340F4; Mon, 14 Mar 2022 12:09:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1647259792; bh=H5PrVNJ9RgkeRrsR7UrsrQ5G4Bj6FAhEeIAnrs3d6CU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rPxJIz31RV0Vvw/84Pv5UrrwQV1Iu93datJx1KgEBMc2wgi80Fw8gSO/NWBFiSG6v sGSRW3UpkKcvSMGy3M5Qlvb0N2kYerZvLOtyXPzQAkn/ezOAkAqw0ewvTmihxu6/eO NSdN4JITYAYIdYpMoL6tIJM4OS2egpcWgbZS8d7k= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dima Chumak , Roi Dayan , Saeed Mahameed Subject: [PATCH 5.15 091/110] net/mlx5: Fix offloading with ESWITCH_IPV4_TTL_MODIFY_ENABLE Date: Mon, 14 Mar 2022 12:54:33 +0100 Message-Id: <20220314112745.570049869@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220314112743.029192918@linuxfoundation.org> References: <20220314112743.029192918@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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 From: Dima Chumak commit 39bab83b119faac4bf7f07173a42ed35be95147e upstream. Only prio 1 is supported for nic mode when there is no ignore flow level support in firmware. But for switchdev mode, which supports fixed number of statically pre-allocated prios, this restriction is not relevant so it can be relaxed. Fixes: d671e109bd85 ("net/mlx5: Fix tc max supported prio for nic mode") Signed-off-by: Dima Chumak Reviewed-by: Roi Dayan Signed-off-by: Saeed Mahameed Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/mellanox/mlx5/core/lib/fs_chains.c | 3 --- 1 file changed, 3 deletions(-) --- a/drivers/net/ethernet/mellanox/mlx5/core/lib/fs_chains.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/lib/fs_chains.c @@ -121,9 +121,6 @@ u32 mlx5_chains_get_nf_ft_chain(struct m u32 mlx5_chains_get_prio_range(struct mlx5_fs_chains *chains) { - if (!mlx5_chains_prios_supported(chains)) - return 1; - if (mlx5_chains_ignore_flow_level_supported(chains)) return UINT_MAX;