From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 93D3BA034F for ; Tue, 1 Mar 2022 11:45:12 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8EEC1407FF; Tue, 1 Mar 2022 11:45:12 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id CA072407FF for ; Tue, 1 Mar 2022 11:45:11 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646131511; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rePwLCy8SlzVcCwjeK+C6YwJOeJmJv1LjNEBJUNsJxk=; b=VarP5GFn7etwZDpSMmXzYXON2bMGnd7l7NWl0pWXhOpBsRwyEz7h4HDo6k+Be+tn4/Danx lWcy9V7xoI2YGEer7Twf4acc1u3WtxF8qZv3YHb5Y2wImHgG5B3CF9q01w5fBMSws/58VR X6moxTRgDXP2kq36wPh9AHkWB+u79bc= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-436-q6ZJ5RcBP2yiyJF2KzLk6w-1; Tue, 01 Mar 2022 05:45:08 -0500 X-MC-Unique: q6ZJ5RcBP2yiyJF2KzLk6w-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2377151DC; Tue, 1 Mar 2022 10:45:07 +0000 (UTC) Received: from rh.Home (unknown [10.39.194.142]) by smtp.corp.redhat.com (Postfix) with ESMTP id 76CB7752D3; Tue, 1 Mar 2022 10:45:05 +0000 (UTC) From: Kevin Traynor To: Ivan Malov Cc: Andrew Rybchenko , Andy Moreton , dpdk stable Subject: patch 'net/sfc: fix flow tunnel support detection' has been queued to stable release 21.11.1 Date: Tue, 1 Mar 2022 10:42:14 +0000 Message-Id: <20220301104300.334382-58-ktraynor@redhat.com> In-Reply-To: <20220301104300.334382-1-ktraynor@redhat.com> References: <20220301104300.334382-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 21.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/06/22. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/ea21c6bf4ee80c65f0afabfa94cbd2087782abc2 Thanks. Kevin --- >From ea21c6bf4ee80c65f0afabfa94cbd2087782abc2 Mon Sep 17 00:00:00 2001 From: Ivan Malov Date: Fri, 18 Feb 2022 01:25:09 +0300 Subject: [PATCH] net/sfc: fix flow tunnel support detection [ upstream commit de32ec32d720ca3070a48a24da1a18eb315003fe ] The condition for that must use the new MAE admin status. Fixes: 2f577f0ea1a3 ("net/sfc: allow ports without MAE privilege") Signed-off-by: Ivan Malov Reviewed-by: Andrew Rybchenko Reviewed-by: Andy Moreton --- drivers/net/sfc/sfc_flow_tunnel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/sfc/sfc_flow_tunnel.c b/drivers/net/sfc/sfc_flow_tunnel.c index 463b01c596..e9eca90012 100644 --- a/drivers/net/sfc/sfc_flow_tunnel.c +++ b/drivers/net/sfc/sfc_flow_tunnel.c @@ -22,5 +22,5 @@ sfc_flow_tunnel_is_supported(struct sfc_adapter *sa) return ((sa->priv.dp_rx->features & SFC_DP_RX_FEAT_FLOW_MARK) != 0 && - sa->mae.status == SFC_MAE_STATUS_SUPPORTED); + sa->mae.status == SFC_MAE_STATUS_ADMIN); } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-01 10:41:02.981335532 +0000 +++ 0058-net-sfc-fix-flow-tunnel-support-detection.patch 2022-03-01 10:41:01.344244106 +0000 @@ -1 +1 @@ -From de32ec32d720ca3070a48a24da1a18eb315003fe Mon Sep 17 00:00:00 2001 +From ea21c6bf4ee80c65f0afabfa94cbd2087782abc2 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit de32ec32d720ca3070a48a24da1a18eb315003fe ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org