[dpdk-stable] patch 'ethdev: fix callback unregister with wildcard argument list' has been queued to LTS release 18.11.7

Kevin Traynor ktraynor at redhat.com
Fri Feb 7 16:12:44 CET 2020


Hi,

FYI, your patch has been queued to LTS release 18.11.7

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/13/20. 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/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/bc5c69b58a8a96e62ec46811055796ce1d08ca73

Thanks.

Kevin.

---
>From bc5c69b58a8a96e62ec46811055796ce1d08ca73 Mon Sep 17 00:00:00 2001
From: Ricardo Roldan <rroldan at bequant.com>
Date: Tue, 7 Jan 2020 16:51:36 +0100
Subject: [PATCH] ethdev: fix callback unregister with wildcard argument list

[ upstream commit ba1e69f121b97b4c8673a48c98072accdbc5af46 ]

The function was checking -1 against the callback data instead of
the given cb_arg parameter.

Fixes: af75078fece3 ("first public release")

Signed-off-by: Ricardo Roldan <rroldan at bequant.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
---
 lib/librte_ethdev/rte_ethdev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c
index a5df3e562e..51954456c2 100644
--- a/lib/librte_ethdev/rte_ethdev.c
+++ b/lib/librte_ethdev/rte_ethdev.c
@@ -3461,5 +3461,5 @@ rte_eth_dev_callback_unregister(uint16_t port_id,
 
 			if (cb->cb_fn != cb_fn || cb->event != event ||
-			    (cb->cb_arg != (void *)-1 && cb->cb_arg != cb_arg))
+			    (cb_arg != (void *)-1 && cb->cb_arg != cb_arg))
 				continue;
 
-- 
2.21.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-07 15:08:19.192408000 +0000
+++ 0032-ethdev-fix-callback-unregister-with-wildcard-argumen.patch	2020-02-07 15:08:17.568062232 +0000
@@ -1 +1 @@
-From ba1e69f121b97b4c8673a48c98072accdbc5af46 Mon Sep 17 00:00:00 2001
+From bc5c69b58a8a96e62ec46811055796ce1d08ca73 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit ba1e69f121b97b4c8673a48c98072accdbc5af46 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -19 +20 @@
-index 6e9cb243ea..aec2d0f704 100644
+index a5df3e562e..51954456c2 100644
@@ -22 +23 @@
-@@ -4040,5 +4040,5 @@ rte_eth_dev_callback_unregister(uint16_t port_id,
+@@ -3461,5 +3461,5 @@ rte_eth_dev_callback_unregister(uint16_t port_id,



More information about the stable mailing list