patch 'net: fix VLAN insert doc for shared-mbuf error code' has been queued to stable release 24.11.9
luca.boccassi at gmail.com
luca.boccassi at gmail.com
Tue Oct 27 12:48:42 CET 2026
Hi,
FYI, your patch has been queued to stable release 24.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 10/29/26. 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/57fa44d585937d74c18444fa81612c1fe3c7867d
Thanks.
Luca Boccassi
---
>From 57fa44d585937d74c18444fa81612c1fe3c7867d Mon Sep 17 00:00:00 2001
From: William Bland <blandwwa at gmail.com>
Date: Wed, 26 Aug 2026 13:38:38 -0400
Subject: [PATCH] net: fix VLAN insert doc for shared-mbuf error code
[ upstream commit 3ffabed4ba32d4d999759630a23053bcec796b9f ]
The implementation returns -EINVAL when the mbuf is shared or
indirect, but the doc comment inaccurately stated -EPERM.
Fixes: c974021a5949 ("ether: add soft vlan encap/decap")
Signed-off-by: William Bland <blandwwa at gmail.com>
---
.mailmap | 1 +
lib/net/rte_ether.h | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/.mailmap b/.mailmap
index d554ac14db9..1100db63fa8 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1745,6 +1745,7 @@ Wenxuan Wu <wenxuanx.wu at intel.com>
Wenzhuo Lu <wenzhuo.lu at intel.com>
Weqaar Janjua <weqaar.a.janjua at intel.com>
Wiktor Pilarczyk <wiktor.pilarczyk at intel.com>
+William Bland <blandwwa at gmail.com>
William Tu <u9012063 at gmail.com>
Wisam Jaddo <wisamm at nvidia.com> <wisamm at mellanox.com>
Wojciech Andralojc <wojciechx.andralojc at intel.com>
diff --git a/lib/net/rte_ether.h b/lib/net/rte_ether.h
index c9a0b536c35..240ba22429c 100644
--- a/lib/net/rte_ether.h
+++ b/lib/net/rte_ether.h
@@ -387,8 +387,9 @@ static inline int rte_vlan_strip(struct rte_mbuf *m)
* The packet mbuf.
* @return
* - 0: On success
- * -EPERM: mbuf is shared overwriting would be unsafe
- * -ENOSPC: not enough headroom in mbuf
+ * - -EINVAL: overwriting would be unsafe because mbuf is shared or
+ * indirect, or mbuf's first segment is too short
+ * - -ENOSPC: not enough headroom in mbuf
*/
static inline int rte_vlan_insert(struct rte_mbuf **m)
{
--
2.47.3
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2026-10-27 11:43:54.837984741 +0000
+++ 0028-net-fix-VLAN-insert-doc-for-shared-mbuf-error-code.patch 2026-10-27 11:43:53.522059697 +0000
@@ -1 +1 @@
-From 3ffabed4ba32d4d999759630a23053bcec796b9f Mon Sep 17 00:00:00 2001
+From 57fa44d585937d74c18444fa81612c1fe3c7867d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 3ffabed4ba32d4d999759630a23053bcec796b9f ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -19 +20 @@
-index a8ca7f7246..ef64c6bc53 100644
+index d554ac14db9..1100db63fa8 100644
@@ -22 +23 @@
-@@ -1841,6 +1841,7 @@ Wenxuan Wu <wenxuanx.wu at intel.com>
+@@ -1745,6 +1745,7 @@ Wenxuan Wu <wenxuanx.wu at intel.com>
@@ -31 +32 @@
-index c9a0b536c3..240ba22429 100644
+index c9a0b536c35..240ba22429c 100644
More information about the stable
mailing list