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 0D027A0A02 for ; Mon, 17 May 2021 18:11:49 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 03D7C40041; Mon, 17 May 2021 18:11:49 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id D277D410F1 for ; Mon, 17 May 2021 18:11:45 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=Keschdeichel.fritz.box) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lifqL-0007cy-14; Mon, 17 May 2021 16:11:45 +0000 From: Christian Ehrhardt To: Ivan Malov Cc: Andrew Rybchenko , Ferruh Yigit , dpdk stable Date: Mon, 17 May 2021 18:07:37 +0200 Message-Id: <20210517161039.3132619-28-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> References: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net: fix comment in IPv6 header' has been queued to stable release 19.11.9 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/19/21. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/e70313d86b119f29f2b88702d8e51cfe7e8d5429 Thanks. Christian Ehrhardt --- >From e70313d86b119f29f2b88702d8e51cfe7e8d5429 Mon Sep 17 00:00:00 2001 From: Ivan Malov Date: Mon, 8 Mar 2021 09:51:04 +0300 Subject: [PATCH] net: fix comment in IPv6 header [ upstream commit 24f8b2d896328785038400046773a1e412360627 ] The comment got it wrong. The payload length field does not include the fixed IPv6 header size. Fixes: 7eca7f7fd09d ("net: add missing endianness annotations") Fixes: af75078fece3 ("first public release") Signed-off-by: Ivan Malov Reviewed-by: Andrew Rybchenko Reviewed-by: Ferruh Yigit --- lib/librte_net/rte_ip.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/librte_net/rte_ip.h b/lib/librte_net/rte_ip.h index d34c0611f0..f03db05e18 100644 --- a/lib/librte_net/rte_ip.h +++ b/lib/librte_net/rte_ip.h @@ -365,7 +365,7 @@ rte_ipv4_udptcp_cksum(const struct rte_ipv4_hdr *ipv4_hdr, const void *l4_hdr) */ struct rte_ipv6_hdr { rte_be32_t vtc_flow; /**< IP version, traffic class & flow label. */ - rte_be16_t payload_len; /**< IP packet length - includes header size */ + rte_be16_t payload_len; /**< IP payload size, including ext. headers */ uint8_t proto; /**< Protocol, next header. */ uint8_t hop_limits; /**< Hop limits. */ uint8_t src_addr[16]; /**< IP address of source host. */ -- 2.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-17 17:40:30.659449251 +0200 +++ 0028-net-fix-comment-in-IPv6-header.patch 2021-05-17 17:40:29.147809287 +0200 @@ -1 +1 @@ -From 24f8b2d896328785038400046773a1e412360627 Mon Sep 17 00:00:00 2001 +From e70313d86b119f29f2b88702d8e51cfe7e8d5429 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 24f8b2d896328785038400046773a1e412360627 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 212ff2c4fd..b59c4d67a3 100644 +index d34c0611f0..f03db05e18 100644 @@ -24 +25 @@ -@@ -384,7 +384,7 @@ rte_ipv4_udptcp_cksum(const struct rte_ipv4_hdr *ipv4_hdr, const void *l4_hdr) +@@ -365,7 +365,7 @@ rte_ipv4_udptcp_cksum(const struct rte_ipv4_hdr *ipv4_hdr, const void *l4_hdr)