patch 'net/tap: fix qdisc add failure handling' has been queued to stable release 22.11.9

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 22.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 06/14/25. 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/ad22d940fa5d8c4a2dd6cd118bc200fa213e3d52

Thanks.

Luca Boccassi

---
>From ad22d940fa5d8c4a2dd6cd118bc200fa213e3d52 Mon Sep 17 00:00:00 2001
From: Yan Lu <luyan at cmss.chinamobile.com>
Date: Wed, 21 May 2025 09:33:13 +0800
Subject: [PATCH] net/tap: fix qdisc add failure handling

[ upstream commit 02a68649e6fb55d8975c726e3073ee9d12c20bac ]

The errno variable was assigned a positive value in the previous handling,
but here it is compared against -EEXIST,
When the tap already exists, this would falsely report an error.

Fixes: 6fc6de7e0eaf ("net/tap: update netlink error code management")

Signed-off-by: Yan Lu <luyan at cmss.chinamobile.com>
---
 .mailmap                     | 1 +
 drivers/net/tap/tap_tcmsgs.c | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.mailmap b/.mailmap
index 7bbd4bb02e..8cd91eff62 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1569,6 +1569,7 @@ Yanglong Wu <yanglong.wu at intel.com>
 Yang Ming <ming.1.yang at nokia-sbell.com>
 Yang Zhang <zy107165 at alibaba-inc.com>
 Yanjie Xu <yanjie.xu at intel.com>
+Yan Lu <luyan at cmss.chinamobile.com>
 Yan Xia <yanx.xia at intel.com>
 Yao-Po Wang <blue119 at gmail.com>
 Yao Zhao <yao.zhao at windriver.com>
diff --git a/drivers/net/tap/tap_tcmsgs.c b/drivers/net/tap/tap_tcmsgs.c
index a3aae3c814..24a0423a0e 100644
--- a/drivers/net/tap/tap_tcmsgs.c
+++ b/drivers/net/tap/tap_tcmsgs.c
@@ -261,7 +261,7 @@ qdisc_create_multiq(int nlsk_fd, unsigned int ifindex)
 	int err = 0;
 
 	err = qdisc_add_multiq(nlsk_fd, ifindex);
-	if (err < 0 && errno != -EEXIST) {
+	if (err < 0 && errno != EEXIST) {
 		TAP_LOG(ERR, "Could not add multiq qdisc (%d): %s",
 			errno, strerror(errno));
 		return -1;
@@ -287,7 +287,7 @@ qdisc_create_ingress(int nlsk_fd, unsigned int ifindex)
 	int err = 0;
 
 	err = qdisc_add_ingress(nlsk_fd, ifindex);
-	if (err < 0 && errno != -EEXIST) {
+	if (err < 0 && errno != EEXIST) {
 		TAP_LOG(ERR, "Could not add ingress qdisc (%d): %s",
 			errno, strerror(errno));
 		return -1;
-- 
2.47.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2025-06-12 22:06:25.509599259 +0100
+++ 0044-net-tap-fix-qdisc-add-failure-handling.patch	2025-06-12 22:06:23.874044722 +0100
@@ -1 +1 @@
-From 02a68649e6fb55d8975c726e3073ee9d12c20bac Mon Sep 17 00:00:00 2001
+From ad22d940fa5d8c4a2dd6cd118bc200fa213e3d52 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 02a68649e6fb55d8975c726e3073ee9d12c20bac ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
-index 59ee5f7d30..df3674cc7f 100644
+index 7bbd4bb02e..8cd91eff62 100644
@@ -23 +24,2 @@
-@@ -1746,6 +1746,7 @@ Yang Ming <ming.1.yang at nokia-sbell.com>
+@@ -1569,6 +1569,7 @@ Yanglong Wu <yanglong.wu at intel.com>
+ Yang Ming <ming.1.yang at nokia-sbell.com>
@@ -25 +26,0 @@
- Yaniv Rosner <yrosner at nvidia.com>
@@ -32 +33 @@
-index 1755b57519..caca9445c8 100644
+index a3aae3c814..24a0423a0e 100644