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 421DDA0093 for ; Wed, 9 Mar 2022 17:32:27 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3C0A44013F; Wed, 9 Mar 2022 17:32:27 +0100 (CET) Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by mails.dpdk.org (Postfix) with ESMTP id 33DCA410F3 for ; Wed, 9 Mar 2022 17:32:25 +0100 (CET) Received: by mail-wr1-f41.google.com with SMTP id k24so3919500wrd.7 for ; Wed, 09 Mar 2022 08:32:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=VZ33FUfKENVuAvLb48uVzFuCGe2dDlW2qrgQGfTWxUc=; b=JEgGWDLVM5YUtBEbNxyuLKE9+qBcM27fwc9Pbjd12A62VkMbbtaJEyP8AWv+bStowm uYpSbJE0spxGtGXlRCpwZtC8ejN6xQfcbtrmIMvTDyX5RTc3qrn2eO5OJ2DdfthkijPY kDfEYd76ERtT95qTXK0hmQDvVwTQ3InqmmIsAyYBWZy3EGgTRKLFQOewz3Ig1di+JFaE oS1AieT7D4kVzxrY54AuPP++CgGayAiuZbrsstY8yC3cezq+vYS7+87G/cpg5TCZPiq7 ZN+Hrt5aiCqIBqdhuf+EiqCDywsPLrynvYFu6m3hLsVUJUh0bavPOpO1XlxOK2Tp+U/O lF7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=VZ33FUfKENVuAvLb48uVzFuCGe2dDlW2qrgQGfTWxUc=; b=jSGI9eZIu2YqYrlt2bQMZRjgR0R/U3SZP9bas0WUQXvMz92I1s2gjNf0fG5Yg8vrTI Z2lp856nJA6ol6zOAUewz/VBhaeiWs9tyKFoeusokEHCOVTamMQVyKdtX7aEOMeGQ8jE 4KtZY6G1OyDuHIBBNVBnvM3UOewsQ5DMuXoolHuB2yAsXA2zp70rouPCpNYi/nGJfYop QjrYuv+VMslNUaqrEyYuS2kr+M04fTLXX0sIcR2cDuSQd6nqSNvzD6JsoO2a7KIu5W2L bB+LZl62bEihbNFrwZjmyhjelquVcsD8L2r79K0uPHFUbdPyevixnMDdJb+k1ZpFSynU bRIA== X-Gm-Message-State: AOAM532fdK/EkJszvotAPDqaD1lsGiQV7qv2/iEAvg3vFdyuhhu9rUFJ IDVbY+PdqLdcbfXU4c3Sv2M+VoWdk28= X-Google-Smtp-Source: ABdhPJzi2Wt65GQyBA/90HRxwUey5Nzey9Vjw2U4b7OvOvQD7nJFv2LwRUSMP8NVQz5YtiuwWPmmeg== X-Received: by 2002:adf:f94d:0:b0:1e5:5ca1:2b80 with SMTP id q13-20020adff94d000000b001e55ca12b80mr335836wrr.323.1646843544878; Wed, 09 Mar 2022 08:32:24 -0800 (PST) Received: from localhost ([2a01:4b00:f41a:3600:360b:9754:2e3a:c344]) by smtp.gmail.com with ESMTPSA id v5-20020adfe4c5000000b001edc1e5053esm2007812wrm.82.2022.03.09.08.32.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Mar 2022 08:32:24 -0800 (PST) From: luca.boccassi@gmail.com To: Gregory Etelson Cc: Matan Azrad , dpdk stable Subject: patch 'net/mlx5: fix inet IPIP protocol type' has been queued to stable release 20.11.5 Date: Wed, 9 Mar 2022 16:30:45 +0000 Message-Id: <20220309163053.245754-29-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220309163053.245754-1-luca.boccassi@gmail.com> References: <20220218123931.1749595-1-luca.boccassi@gmail.com> <20220309163053.245754-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 20.11.5 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/11/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/7913c9202f4b8f8d35d2d198516c78dc9059475d Thanks. Luca Boccassi --- >From 7913c9202f4b8f8d35d2d198516c78dc9059475d 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 69f57605f8..24c2665c53 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -201,7 +201,7 @@ mlx5_inet_proto_to_item_type(uint8_t proto_spec, uint8_t proto_mask) case IPPROTO_TCP: type = RTE_FLOW_ITEM_TYPE_TCP; break; - case IPPROTO_IP: + case IPPROTO_IPIP: type = RTE_FLOW_ITEM_TYPE_IPV4; break; case IPPROTO_IPV6: -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-09 16:30:09.576642385 +0000 +++ 0029-net-mlx5-fix-inet-IPIP-protocol-type.patch 2022-03-09 16:30:08.567025602 +0000 @@ -1 +1 @@ -From d16ec6841b5e2e8ee7e224d4456aaf4d5e02e13b Mon Sep 17 00:00:00 2001 +From 7913c9202f4b8f8d35d2d198516c78dc9059475d 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 69f57605f8..24c2665c53 100644 @@ -21 +22 @@ -@@ -202,7 +202,7 @@ mlx5_inet_proto_to_item_type(uint8_t proto_spec, uint8_t proto_mask) +@@ -201,7 +201,7 @@ mlx5_inet_proto_to_item_type(uint8_t proto_spec, uint8_t proto_mask)