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 A575B433F5 for ; Wed, 29 Nov 2023 03:33:17 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9837E42E18; Wed, 29 Nov 2023 03:33:17 +0100 (CET) Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by mails.dpdk.org (Postfix) with ESMTP id 5A5A2402A9 for ; Wed, 29 Nov 2023 03:33:16 +0100 (CET) Received: by mail-wr1-f47.google.com with SMTP id ffacd0b85a97d-332f90a375eso2372678f8f.3 for ; Tue, 28 Nov 2023 18:33:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701225196; x=1701829996; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=KeaSAVTxkjS/fjZolKg/ZPjh9Q4R6ByUeR35XVOLTJ4=; b=bB7nChH4QLgv71AZwv8nlvY5uq9Ra1JVr/I+1Cx+phkKWW9QDmQ4fDGvuhCbFRCx7K wRfDh7H4GSM57VPHCUhefOgkLBBDM+wfFIGTtJgl6viMhW+1uOoz+R6CYyhyNBdaaQsB GSmOHBMG6HEi6tbNpwdrfXVB1e3fzVCF6oDT49HzV/Fvgg1eKgrzmbCpfcaPvXvGEuQV T12QuFB4kaZit0bttdY5YHF+OdNbkvDD42S+uztJZgDnOOBQ25cxB2BX72gnGbRBe07G 9A1XetmVhr2EvZjjcQqMdzjstq6hmfg29KfUUO7MGhtGpIOxm2M4adjWm3KAPsqhRQfR fauA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701225196; x=1701829996; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KeaSAVTxkjS/fjZolKg/ZPjh9Q4R6ByUeR35XVOLTJ4=; b=iLeefmBEYqi68DREI2AwRoruyLyzBorRWQeBZNo9Q98cdCQpNE48BdATs3v1Kwlu5a IkLaoTtaQfD0qK85bZeu9qKS7oIH8s5ExlrGyhyuSDmHvvZraAWZmOmQcU2K2gUD/L7L F1VGe/YATFmvdSBIrEObj5qBx9eYXmlc/3/E2GX1zvixTZimN2g9rP59mlklMEKY/Gee 9JZ0b6H+3boXCWwpIz/g33Ud/nUA1AnD0MuK2R2VpJs++uB0/rF3PWtJp8xTEa1o5VgV R5x92orAjEo4zHc+FeKOfGIvkUPos88sE0RNMGmmgGIefQRvUCSUW2P5xaAFEdLBNDfy FzTA== X-Gm-Message-State: AOJu0YwvHDDlgYTcBo3xsaAhd8T6dA20HMuhbFZU8k921xDkuaGVvnra vgkZ8x3ciY3UKM43RfX/0j9W0yYja/csUA== X-Google-Smtp-Source: AGHT+IEJiKsGXGgX+U+znyOioyjvZT7kOx4cn50s3jAaCTp2eUp2hblgRPCP1G9cWA6V7lMTPS13NQ== X-Received: by 2002:a5d:6305:0:b0:333:725:bd1f with SMTP id i5-20020a5d6305000000b003330725bd1fmr4612300wru.19.1701225195809; Tue, 28 Nov 2023 18:33:15 -0800 (PST) Received: from localhost ([137.220.119.58]) by smtp.gmail.com with ESMTPSA id c17-20020adffb51000000b00333195cf61csm73620wrs.13.2023.11.28.18.33.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Nov 2023 18:33:15 -0800 (PST) From: luca.boccassi@gmail.com To: Alexander Kozyrev Cc: =?UTF-8?q?Morten=20Br=C3=B8rup?= , dpdk stable Subject: patch 'ethdev: fix ESP packet type description' has been queued to stable release 20.11.10 Date: Wed, 29 Nov 2023 02:32:51 +0000 Message-Id: <20231129023251.1780959-6-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231129023251.1780959-1-luca.boccassi@gmail.com> References: <20231123161709.670852-9-luca.boccassi@gmail.com> <20231129023251.1780959-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/01/23. 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/2ffe9f3da36e4f12408b2f4f99b8b9e91d7a7bda Thanks. Luca Boccassi --- >From 2ffe9f3da36e4f12408b2f4f99b8b9e91d7a7bda Mon Sep 17 00:00:00 2001 From: Alexander Kozyrev Date: Wed, 25 Oct 2023 23:32:15 +0300 Subject: [PATCH] ethdev: fix ESP packet type description MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit f647d53bdebc1a9273c01caad280aadc64d0487e ] The correct protocol number for ESP (IP Encapsulating Security Payload) packet type is 50. 51 is IPSec AH (Authentication Header). Fixes: 1e84afd3906b ("mbuf: add security crypto flags and fields") Signed-off-by: Alexander Kozyrev Reviewed-by: Morten Brørup --- lib/librte_mbuf/rte_mbuf_ptype.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/librte_mbuf/rte_mbuf_ptype.h b/lib/librte_mbuf/rte_mbuf_ptype.h index 17a2dd3576..f2276e2909 100644 --- a/lib/librte_mbuf/rte_mbuf_ptype.h +++ b/lib/librte_mbuf/rte_mbuf_ptype.h @@ -419,10 +419,10 @@ extern "C" { * * Packet format: * <'ether type'=0x0800 - * | 'version'=4, 'protocol'=51> + * | 'version'=4, 'protocol'=50> * or, * <'ether type'=0x86DD - * | 'version'=6, 'next header'=51> + * | 'version'=6, 'next header'=50> */ #define RTE_PTYPE_TUNNEL_ESP 0x00009000 /** -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-11-29 02:31:25.053236158 +0000 +++ 0006-ethdev-fix-ESP-packet-type-description.patch 2023-11-29 02:31:24.793770882 +0000 @@ -1 +1 @@ -From f647d53bdebc1a9273c01caad280aadc64d0487e Mon Sep 17 00:00:00 2001 +From 2ffe9f3da36e4f12408b2f4f99b8b9e91d7a7bda Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit f647d53bdebc1a9273c01caad280aadc64d0487e ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ - lib/mbuf/rte_mbuf_ptype.h | 4 ++-- + lib/librte_mbuf/rte_mbuf_ptype.h | 4 ++-- @@ -21 +22 @@ -diff --git a/lib/mbuf/rte_mbuf_ptype.h b/lib/mbuf/rte_mbuf_ptype.h +diff --git a/lib/librte_mbuf/rte_mbuf_ptype.h b/lib/librte_mbuf/rte_mbuf_ptype.h @@ -23,2 +24,2 @@ ---- a/lib/mbuf/rte_mbuf_ptype.h -+++ b/lib/mbuf/rte_mbuf_ptype.h +--- a/lib/librte_mbuf/rte_mbuf_ptype.h ++++ b/lib/librte_mbuf/rte_mbuf_ptype.h