patch 'app/testpmd: fix build with clang 15 in flow code' has been queued to stable release 20.11.7
luca.boccassi at gmail.com
luca.boccassi at gmail.com
Tue Nov 22 23:02:30 CET 2022
Hi,
FYI, your patch has been queued to stable release 20.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 11/24/22. 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
This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/1b0e836662deb509ba4d1010ee1f9bbdd5556d72
Thanks.
Luca Boccassi
---
>From 1b0e836662deb509ba4d1010ee1f9bbdd5556d72 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand at redhat.com>
Date: Fri, 18 Nov 2022 09:53:10 +0100
Subject: [PATCH] app/testpmd: fix build with clang 15 in flow code
[ upstream commit 2809981e858f5cfa3ea9182e400a2c67f7c4744d ]
This variable is not used and has been copy/pasted in a lot of other
code.
Fixes: 938a184a1870 ("app/testpmd: implement basic support for flow API")
Fixes: 55509e3a49fb ("app/testpmd: support shared flow action")
Fixes: 04cc665fab38 ("app/testpmd: add flow template management")
Fixes: c4b38873346b ("app/testpmd: add flow table management")
Fixes: ecdc927b99f2 ("app/testpmd: add async flow create/destroy operations")
Fixes: d906fff51878 ("app/testpmd: add async indirect actions operations")
Signed-off-by: David Marchand <david.marchand at redhat.com>
Acked-by: Tyler Retzlaff <roretzla at linux.microsoft.com>
---
app/test-pmd/config.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index f3ffc23ecd..9e2e8aeb8f 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -1842,7 +1842,6 @@ port_shared_action_destroy(portid_t port_id,
{
struct rte_port *port;
struct port_shared_action **tmp;
- uint32_t c = 0;
int ret = 0;
if (port_id_is_invalid(port_id, ENABLED_WARN) ||
@@ -1877,7 +1876,6 @@ port_shared_action_destroy(portid_t port_id,
}
if (i == n)
tmp = &(*tmp)->next;
- ++c;
}
return ret;
}
@@ -2186,7 +2184,6 @@ port_flow_destroy(portid_t port_id, uint32_t n, const uint32_t *rule)
{
struct rte_port *port;
struct port_flow **tmp;
- uint32_t c = 0;
int ret = 0;
if (port_id_is_invalid(port_id, ENABLED_WARN) ||
@@ -2219,7 +2216,6 @@ port_flow_destroy(portid_t port_id, uint32_t n, const uint32_t *rule)
}
if (i == n)
tmp = &(*tmp)->next;
- ++c;
}
return ret;
}
--
2.34.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2022-11-22 22:01:31.922900641 +0000
+++ 0006-app-testpmd-fix-build-with-clang-15-in-flow-code.patch 2022-11-22 22:01:31.483524189 +0000
@@ -1 +1 @@
-From 2809981e858f5cfa3ea9182e400a2c67f7c4744d Mon Sep 17 00:00:00 2001
+From 1b0e836662deb509ba4d1010ee1f9bbdd5556d72 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 2809981e858f5cfa3ea9182e400a2c67f7c4744d ]
+
@@ -15 +16,0 @@
-Cc: stable at dpdk.org
@@ -20,2 +21,2 @@
- app/test-pmd/config.c | 14 --------------
- 1 file changed, 14 deletions(-)
+ app/test-pmd/config.c | 4 ----
+ 1 file changed, 4 deletions(-)
@@ -24 +25 @@
-index 982549ffed..9103ba6c77 100644
+index f3ffc23ecd..9e2e8aeb8f 100644
@@ -27,33 +28 @@
-@@ -1787,7 +1787,6 @@ port_action_handle_destroy(portid_t port_id,
- {
- struct rte_port *port;
- struct port_indirect_action **tmp;
-- uint32_t c = 0;
- int ret = 0;
-
- if (port_id_is_invalid(port_id, ENABLED_WARN) ||
-@@ -1822,7 +1821,6 @@ port_action_handle_destroy(portid_t port_id,
- }
- if (i == n)
- tmp = &(*tmp)->next;
-- ++c;
- }
- return ret;
- }
-@@ -2251,7 +2249,6 @@ port_flow_pattern_template_destroy(portid_t port_id, uint32_t n,
- {
- struct rte_port *port;
- struct port_template **tmp;
-- uint32_t c = 0;
- int ret = 0;
-
- if (port_id_is_invalid(port_id, ENABLED_WARN) ||
-@@ -2288,7 +2285,6 @@ port_flow_pattern_template_destroy(portid_t port_id, uint32_t n,
- }
- if (i == n)
- tmp = &(*tmp)->next;
-- ++c;
- }
- return ret;
- }
-@@ -2368,7 +2364,6 @@ port_flow_actions_template_destroy(portid_t port_id, uint32_t n,
+@@ -1842,7 +1842,6 @@ port_shared_action_destroy(portid_t port_id,
@@ -62 +31 @@
- struct port_template **tmp;
+ struct port_shared_action **tmp;
@@ -67,49 +36 @@
-@@ -2404,7 +2399,6 @@ port_flow_actions_template_destroy(portid_t port_id, uint32_t n,
- }
- if (i == n)
- tmp = &(*tmp)->next;
-- ++c;
- }
- return ret;
- }
-@@ -2534,7 +2528,6 @@ port_flow_template_table_destroy(portid_t port_id,
- {
- struct rte_port *port;
- struct port_table **tmp;
-- uint32_t c = 0;
- int ret = 0;
-
- if (port_id_is_invalid(port_id, ENABLED_WARN) ||
-@@ -2571,7 +2564,6 @@ port_flow_template_table_destroy(portid_t port_id,
- }
- if (i == n)
- tmp = &(*tmp)->next;
-- ++c;
- }
- return ret;
- }
-@@ -2719,7 +2711,6 @@ port_queue_flow_destroy(portid_t port_id, queueid_t queue_id,
- struct rte_flow_op_attr op_attr = { .postpone = postpone };
- struct rte_port *port;
- struct port_flow **tmp;
-- uint32_t c = 0;
- int ret = 0;
- struct queue_job *job;
-
-@@ -2768,7 +2759,6 @@ port_queue_flow_destroy(portid_t port_id, queueid_t queue_id,
- }
- if (i == n)
- tmp = &(*tmp)->next;
-- ++c;
- }
- return ret;
- }
-@@ -2836,7 +2826,6 @@ port_queue_action_handle_destroy(portid_t port_id,
- const struct rte_flow_op_attr attr = { .postpone = postpone};
- struct rte_port *port;
- struct port_indirect_action **tmp;
-- uint32_t c = 0;
- int ret = 0;
- struct queue_job *job;
-
-@@ -2886,7 +2875,6 @@ port_queue_action_handle_destroy(portid_t port_id,
+@@ -1877,7 +1876,6 @@ port_shared_action_destroy(portid_t port_id,
@@ -123 +44 @@
-@@ -3304,7 +3292,6 @@ port_flow_destroy(portid_t port_id, uint32_t n, const uint32_t *rule)
+@@ -2186,7 +2184,6 @@ port_flow_destroy(portid_t port_id, uint32_t n, const uint32_t *rule)
@@ -131 +52 @@
-@@ -3337,7 +3324,6 @@ port_flow_destroy(portid_t port_id, uint32_t n, const uint32_t *rule)
+@@ -2219,7 +2216,6 @@ port_flow_destroy(portid_t port_id, uint32_t n, const uint32_t *rule)
More information about the stable
mailing list