Received: by 2002:a05:6a10:413:0:0:0:0 with SMTP id 19csp3551873pxp; Tue, 15 Mar 2022 00:32:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw5/r69FFK0FV3Mf/9AavPa71t57ulUExEUXPlxEgDNqC+1YFrohug890RMbbE6w6JJn0q5 X-Received: by 2002:aa7:d450:0:b0:416:cb72:68ff with SMTP id q16-20020aa7d450000000b00416cb7268ffmr18935442edr.161.1647329547137; Tue, 15 Mar 2022 00:32:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647329547; cv=none; d=google.com; s=arc-20160816; b=gYYutmZQrrXdFtdZpyReiKI28ZjzRdSPkFgxTVL0BI39Mvluxz2jGE/YZaLu5JBCn6 FOGwAZs1J3PvuXfNY8BXpN1sIazUnY33oty9u9YOWBqQCWuXmDmHmUAnInkA7i6MiSZf QGkZexKy89YwTpVoJaT2VxiHcZND4xiLCTTAm0bEJhl++saZ8UQZMq4hDZQQZpsyqLpG jtlmARWNFvcoitFNSHaPccsyOcopA0KoaaHRx2HcHaZgGopCRquSOXsZXh37AjmWXAvS HdS3aMVYq6DaW6/UlBOmF3UCnPPmzdGMTGsN00RLznGPIcH8741fWLyZ/HgVyHzYrg91 P6nw== 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=tV6HZii9pmgjQCOsm4S4ZkeBKSH0GDNok2khTpQmCjU/BG/94uHBt9pwnYlGrmnhov fda8UOYiAo9GKcXt0RDeKP3cEMfRkk4UvYfh2o456vOHs9o1CTVvXO+Fmxzy98ON2Npo TGz97WwnsiK2YNnjcso3w5TV7LJp4ytb5DcY5nnym+vDVylNb4ZdIkNtiffdblBq6Dwy L46RBCTOjzuT/uY0nlkcUEroh6uLhfBhJQcI1wSqMpQNqs525GEwo/jskVNjM0TFA4/Y XhJmiMZiWzmxcHdEZ2l9Wi8l/Nwyfo+QYwSgRXyexQ7SuT2w9Tb2tR0+WXDkM7IFYFLN RGEQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=pNuUhsUf; 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 s21-20020a056402521500b00415baee8ba5si12032951edd.252.2022.03.15.00.32.02; Tue, 15 Mar 2022 00:32:27 -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=pNuUhsUf; 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 S245320AbiCNMcy (ORCPT + 99 others); Mon, 14 Mar 2022 08:32:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50614 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243917AbiCNMVX (ORCPT ); Mon, 14 Mar 2022 08:21:23 -0400 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A4B3312AB0; Mon, 14 Mar 2022 05:18:04 -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 sin.source.kernel.org (Postfix) with ESMTPS id 1C3B1CE116D; Mon, 14 Mar 2022 12:18:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 148EEC340E9; Mon, 14 Mar 2022 12:18:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1647260281; bh=H5PrVNJ9RgkeRrsR7UrsrQ5G4Bj6FAhEeIAnrs3d6CU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pNuUhsUf5+cJRnA+2xLq2Oit32SeQt9bqDk8skNx/gURBIQsTwSnEYz5kJCA+xARx 5NpAAixibXaSGhDo2Iame/NsPNv3NiGyeSXYkqj2SOZ+KH6OGNDC2amGDZb9FTa8Y7 L0IXkNlstzjbJ1a++lwR8GFcqZ0Q7FAKH7lW3S18= 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.16 103/121] net/mlx5: Fix offloading with ESWITCH_IPV4_TTL_MODIFY_ENABLE Date: Mon, 14 Mar 2022 12:54:46 +0100 Message-Id: <20220314112746.988662178@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220314112744.120491875@linuxfoundation.org> References: <20220314112744.120491875@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;