patch 'telemetry: make socket handler typedef private' has been queued to stable release 23.11.6

[Shani Peretz]

Hi,

FYI, your patch has been queued to stable release 23.11.6

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/30/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/shanipr/dpdk-stable

This queued commit can be viewed at:
https://github.com/shanipr/dpdk-stable/commit/71b4fa64e2a414398d8562103f263dfbe040b469

Thanks.

Shani

---
>From 71b4fa64e2a414398d8562103f263dfbe040b469 Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson at intel.com>
Date: Fri, 7 Nov 2025 09:32:59 +0000
Subject: [PATCH] telemetry: make socket handler typedef private

[ upstream commit 572451f7728711b1c377cb46d885f918be4c7763 ]

The socket handler typedef, just called "handler" does not belong in the
public namespace, especially since it is unprefixed. Rename to
"telemetry_sock_handler" and move to internal header.

Doing so also clears shadowing warnings in dmadev library, when it is
built with -Wshadow.

Fixes: 6dd571fd07c3 ("telemetry: introduce new functionality")

Signed-off-by: Bruce Richardson <bruce.richardson at intel.com>
Acked-by: Chengwen Feng <fengchengwen at huawei.com>
---
 lib/telemetry/rte_telemetry.h      | 11 -----------
 lib/telemetry/telemetry.c          |  2 +-
 lib/telemetry/telemetry_internal.h | 11 +++++++++++
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/lib/telemetry/rte_telemetry.h b/lib/telemetry/rte_telemetry.h
index cab9daa6fe..bdffd28026 100644
--- a/lib/telemetry/rte_telemetry.h
+++ b/lib/telemetry/rte_telemetry.h
@@ -336,17 +336,6 @@ rte_tel_data_add_dict_uint_hex(struct rte_tel_data *d, const char *name,
 typedef int (*telemetry_cb)(const char *cmd, const char *params,
 		struct rte_tel_data *info);
 
-/**
- * Used for handling data received over a telemetry socket.
- *
- * @param sock_id
- * ID for the socket to be used by the handler.
- *
- * @return
- * Void.
- */
-typedef void * (*handler)(void *sock_id);
-
 /**
  * Used when registering a command and callback function with telemetry.
  *
diff --git a/lib/telemetry/telemetry.c b/lib/telemetry/telemetry.c
index f688db7981..b6d60383c4 100644
--- a/lib/telemetry/telemetry.c
+++ b/lib/telemetry/telemetry.c
@@ -44,7 +44,7 @@ struct cmd_callback {
 struct socket {
 	int sock;
 	char path[sizeof(((struct sockaddr_un *)0)->sun_path)];
-	handler fn;
+	telemetry_sock_handler fn;
 	RTE_ATOMIC(uint16_t) *num_clients;
 };
 static struct socket v2_socket; /* socket for v2 telemetry */
diff --git a/lib/telemetry/telemetry_internal.h b/lib/telemetry/telemetry_internal.h
index b331e9458f..2fd9fbd7c1 100644
--- a/lib/telemetry/telemetry_internal.h
+++ b/lib/telemetry/telemetry_internal.h
@@ -25,6 +25,17 @@ enum rte_telemetry_legacy_data_req {
 	DATA_REQ
 };
 
+/**
+ * Used for handling data received over a telemetry socket.
+ *
+ * @param sock_id
+ * ID for the socket to be used by the handler.
+ *
+ * @return
+ * Void.
+ */
+typedef void * (*telemetry_sock_handler)(void *sock_id);
+
 /**
  * This telemetry callback is used when registering a legacy telemetry command.
  * It handles getting and formatting stats to be returned to telemetry when
-- 
2.43.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2025-12-25 11:16:39.620534995 +0200
+++ 0065-telemetry-make-socket-handler-typedef-private.patch	2025-12-25 11:16:36.043796000 +0200
@@ -1 +1 @@
-From 572451f7728711b1c377cb46d885f918be4c7763 Mon Sep 17 00:00:00 2001
+From 71b4fa64e2a414398d8562103f263dfbe040b469 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 572451f7728711b1c377cb46d885f918be4c7763 ]
+
@@ -14 +15,0 @@
-Cc: stable at dpdk.org
@@ -25 +26 @@
-index b9662a5213..0a58e518f7 100644
+index cab9daa6fe..bdffd28026 100644
@@ -28,2 +29,2 @@
-@@ -325,17 +325,6 @@ typedef int (*telemetry_cb)(const char *cmd, const char *params,
- typedef int (*telemetry_arg_cb)(const char *cmd, const char *params, void *arg,
+@@ -336,17 +336,6 @@ rte_tel_data_add_dict_uint_hex(struct rte_tel_data *d, const char *name,
+ typedef int (*telemetry_cb)(const char *cmd, const char *params,
@@ -47 +48 @@
-index 1cbbffbf3f..cf4324421d 100644
+index f688db7981..b6d60383c4 100644
@@ -50 +51 @@
-@@ -47,7 +47,7 @@ struct cmd_callback {
+@@ -44,7 +44,7 @@ struct cmd_callback {