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 75D44A0093 for ; Thu, 10 Mar 2022 13:12:08 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 713244113F; Thu, 10 Mar 2022 13:12:08 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id E942141148 for ; Thu, 10 Mar 2022 13:12:06 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646914326; 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=I4OSp0W+kx1py65in2YYhfNemdEULG8PTKTGi/OCDsg=; b=idsGssEW/JAE9GeA5YRmOlRhAHAj/USVV77hZUAqDUj5J+kaa22TJJoDrEZvO64/ov441Y VKmOQiXx38qcjkKpOvyOGbeu19xgYiP/790IJ7zh7dNoOvhjnSMNHuPNkAkAbpgfH2b3g9 uI6euppXtT78aCq3eykbNQdzwpNZLtM= 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-625-2-G6cUlaNQKkaTO3zZSl-w-1; Thu, 10 Mar 2022 07:12:03 -0500 X-MC-Unique: 2-G6cUlaNQKkaTO3zZSl-w-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 431301091DA3; Thu, 10 Mar 2022 12:12:02 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.75]) by smtp.corp.redhat.com (Postfix) with ESMTP id 382197FCE8; Thu, 10 Mar 2022 12:12:01 +0000 (UTC) From: Kevin Traynor To: Gregory Etelson Cc: Matan Azrad , dpdk stable Subject: patch 'net/mlx5: fix inet IPIP protocol type' has been queued to stable release 21.11.1 Date: Thu, 10 Mar 2022 12:11:12 +0000 Message-Id: <20220310121127.1324802-6-ktraynor@redhat.com> In-Reply-To: <20220310121127.1324802-1-ktraynor@redhat.com> References: <20220310121127.1324802-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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/14/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/4500ec704f801ef3b46389a4ed754be8d1b753ef Thanks. Kevin --- >From 4500ec704f801ef3b46389a4ed754be8d1b753ef Mon Sep 17 00:00:00 2001 From: Gregory Etelson Date: Tue, 1 Mar 2022 17:18:56 +0200 Subject: [PATCH] net/mlx5: fix inet IPIP protocol type [ upstream commit d16ec6841b5e2e8ee7e224d4456aaf4d5e02e13b ] Fix typo in INET IPIP protocol macro. Fixes: f3f1f576f438 ("net/mlx5: fix RSS expansion with explicit next protocol") Signed-off-by: Gregory Etelson Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_flow.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index 5d56ce96ea..7b53b8413d 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -202,5 +202,5 @@ mlx5_inet_proto_to_item_type(uint8_t proto_spec, uint8_t proto_mask) type = RTE_FLOW_ITEM_TYPE_TCP; break; - case IPPROTO_IP: + case IPPROTO_IPIP: type = RTE_FLOW_ITEM_TYPE_IPV4; break; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-10 12:05:31.592275641 +0000 +++ 0013-net-mlx5-fix-inet-IPIP-protocol-type.patch 2022-03-10 12:05:31.257630747 +0000 @@ -1 +1 @@ -From d16ec6841b5e2e8ee7e224d4456aaf4d5e02e13b Mon Sep 17 00:00:00 2001 +From 4500ec704f801ef3b46389a4ed754be8d1b753ef Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit d16ec6841b5e2e8ee7e224d4456aaf4d5e02e13b ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index a690e2d337..9bb4ce26f7 100644 +index 5d56ce96ea..7b53b8413d 100644 @@ -21 +22 @@ -@@ -203,5 +203,5 @@ mlx5_inet_proto_to_item_type(uint8_t proto_spec, uint8_t proto_mask) +@@ -202,5 +202,5 @@ mlx5_inet_proto_to_item_type(uint8_t proto_spec, uint8_t proto_mask)