[PATCH V3 02/20] NAN: Rename common functions to remove usd suffix
Andrei Otcheretianski
andrei.otcheretianski at intel.com
Thu Feb 5 07:11:59 PST 2026
Rename functions that are common to both NAN USD and synchronized NAN.
Keep USD-specific functions with their original names.
Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski at intel.com>
---
wpa_supplicant/ctrl_iface.c | 16 ++++-----
wpa_supplicant/dbus/dbus_new_handlers.c | 6 ++--
wpa_supplicant/events.c | 2 +-
wpa_supplicant/nan_supplicant.c | 46 ++++++++++++-------------
wpa_supplicant/nan_supplicant.h | 46 ++++++++++++-------------
wpa_supplicant/wpa_supplicant.c | 4 +--
6 files changed, 60 insertions(+), 60 deletions(-)
diff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c
index d918205d51..06e3d0e320 100644
--- a/wpa_supplicant/ctrl_iface.c
+++ b/wpa_supplicant/ctrl_iface.c
@@ -9211,7 +9211,7 @@ static void wpa_supplicant_ctrl_iface_flush(struct wpa_supplicant *wpa_s)
wpa_s->conf->ignore_old_scan_res = 0;
#ifdef CONFIG_NAN_USD
- wpas_nan_usd_flush(wpa_s);
+ wpas_nan_de_flush(wpa_s);
#endif /* CONFIG_NAN_USD */
wpas_pr_flush(wpa_s);
@@ -12836,7 +12836,7 @@ static int wpas_ctrl_nan_publish(struct wpa_supplicant *wpa_s, char *cmd,
goto fail;
}
- publish_id = wpas_nan_usd_publish(wpa_s, service_name, srv_proto_type,
+ publish_id = wpas_nan_publish(wpa_s, service_name, srv_proto_type,
ssi, ¶ms, p2p);
if (publish_id > 0)
ret = os_snprintf(buf, buflen, "%d", publish_id);
@@ -12868,7 +12868,7 @@ static int wpas_ctrl_nan_cancel_publish(struct wpa_supplicant *wpa_s,
return -1;
}
- wpas_nan_usd_cancel_publish(wpa_s, publish_id);
+ wpas_nan_cancel_publish(wpa_s, publish_id);
return 0;
}
@@ -12904,7 +12904,7 @@ static int wpas_ctrl_nan_update_publish(struct wpa_supplicant *wpa_s,
goto fail;
}
- ret = wpas_nan_usd_update_publish(wpa_s, publish_id, ssi);
+ ret = wpas_nan_update_publish(wpa_s, publish_id, ssi);
fail:
wpabuf_free(ssi);
return ret;
@@ -13024,7 +13024,7 @@ static int wpas_ctrl_nan_subscribe(struct wpa_supplicant *wpa_s, char *cmd,
goto fail;
}
- subscribe_id = wpas_nan_usd_subscribe(wpa_s, service_name,
+ subscribe_id = wpas_nan_subscribe(wpa_s, service_name,
srv_proto_type, ssi,
¶ms, p2p);
if (subscribe_id > 0)
@@ -13057,7 +13057,7 @@ static int wpas_ctrl_nan_cancel_subscribe(struct wpa_supplicant *wpa_s,
return -1;
}
- wpas_nan_usd_cancel_subscribe(wpa_s, subscribe_id);
+ wpas_nan_cancel_subscribe(wpa_s, subscribe_id);
return 0;
}
@@ -13138,7 +13138,7 @@ static int wpas_ctrl_nan_transmit(struct wpa_supplicant *wpa_s, char *cmd)
goto fail;
}
- ret = wpas_nan_usd_transmit(wpa_s, handle, ssi, NULL, peer_addr,
+ ret = wpas_nan_transmit(wpa_s, handle, ssi, NULL, peer_addr,
req_instance_id);
fail:
wpabuf_free(ssi);
@@ -14230,7 +14230,7 @@ char * wpa_supplicant_ctrl_iface_process(struct wpa_supplicant *wpa_s,
if (wpas_ctrl_nan_unpause_publish(wpa_s, buf + 20) < 0)
reply_len = -1;
} else if (os_strcmp(buf, "NAN_FLUSH") == 0) {
- wpas_nan_usd_flush(wpa_s);
+ wpas_nan_de_flush(wpa_s);
#endif /* CONFIG_NAN_USD */
#ifdef CONFIG_PASN
} else if (os_strncmp(buf, "PASN_START ", 11) == 0) {
diff --git a/wpa_supplicant/dbus/dbus_new_handlers.c b/wpa_supplicant/dbus/dbus_new_handlers.c
index 2e5f7d2641..90dceaab9f 100644
--- a/wpa_supplicant/dbus/dbus_new_handlers.c
+++ b/wpa_supplicant/dbus/dbus_new_handlers.c
@@ -6600,7 +6600,7 @@ DBusMessage * wpas_dbus_handler_nan_publish(DBusMessage *message,
if (!srv_name)
goto fail;
- publish_id = wpas_nan_usd_publish(wpa_s, srv_name, srv_proto_type, ssi,
+ publish_id = wpas_nan_publish(wpa_s, srv_name, srv_proto_type, ssi,
¶ms, p2p);
if (publish_id < 0) {
reply = wpas_dbus_error_unknown_error(
@@ -6869,7 +6869,7 @@ DBusMessage * wpas_dbus_handler_nan_subscribe(DBusMessage *message,
if (!srv_name)
goto fail;
- subscribe_id = wpas_nan_usd_subscribe(wpa_s, srv_name, srv_proto_type,
+ subscribe_id = wpas_nan_subscribe(wpa_s, srv_name, srv_proto_type,
ssi, ¶ms, p2p);
if (subscribe_id < 0) {
reply = wpas_dbus_error_unknown_error(
@@ -7034,7 +7034,7 @@ DBusMessage * wpas_dbus_handler_nan_transmit(DBusMessage *message,
if (handle < 0 || req_instance_id < 0 || !peer_addr_set || !ssi)
goto fail;
- if (wpas_nan_usd_transmit(wpa_s, handle, ssi, NULL, peer_addr,
+ if (wpas_nan_transmit(wpa_s, handle, ssi, NULL, peer_addr,
req_instance_id) < 0)
reply = wpas_dbus_error_unknown_error(
message, "failed to transmit follow-up");
diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c
index b3e3414651..3d3237ed51 100644
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
@@ -5692,7 +5692,7 @@ static void wpas_event_rx_mgmt_action(struct wpa_supplicant *wpa_s,
WPA_GET_BE32(&payload[1]) == NAN_SDF_VENDOR_TYPE) {
payload += 5;
plen -= 5;
- wpas_nan_usd_rx_sdf(wpa_s, mgmt->sa, mgmt->bssid, freq,
+ wpas_nan_de_rx_sdf(wpa_s, mgmt->sa, mgmt->bssid, freq,
payload, plen);
return;
}
diff --git a/wpa_supplicant/nan_supplicant.c b/wpa_supplicant/nan_supplicant.c
index 999ec79ec4..c2629f902c 100644
--- a/wpa_supplicant/nan_supplicant.c
+++ b/wpa_supplicant/nan_supplicant.c
@@ -488,7 +488,7 @@ static void wpas_nan_process_pr_usd_elems(void *ctx, const u8 *buf, u16 buf_len,
#endif /* CONFIG_PR */
-int wpas_nan_usd_init(struct wpa_supplicant *wpa_s)
+int wpas_nan_de_init(struct wpa_supplicant *wpa_s)
{
struct nan_callbacks cb;
bool offload = !!(wpa_s->drv_flags2 &
@@ -520,7 +520,7 @@ int wpas_nan_usd_init(struct wpa_supplicant *wpa_s)
}
-void wpas_nan_usd_deinit(struct wpa_supplicant *wpa_s)
+void wpas_nan_de_deinit(struct wpa_supplicant *wpa_s)
{
eloop_cancel_timeout(wpas_nan_usd_remain_on_channel_timeout,
wpa_s, ELOOP_ALL_CTX);
@@ -529,9 +529,9 @@ void wpas_nan_usd_deinit(struct wpa_supplicant *wpa_s)
}
-void wpas_nan_usd_rx_sdf(struct wpa_supplicant *wpa_s, const u8 *src,
- const u8 *a3,
- unsigned int freq, const u8 *buf, size_t len)
+void wpas_nan_de_rx_sdf(struct wpa_supplicant *wpa_s, const u8 *src,
+ const u8 *a3, unsigned int freq,
+ const u8 *buf, size_t len)
{
if (!wpa_s->nan_de)
return;
@@ -539,7 +539,7 @@ void wpas_nan_usd_rx_sdf(struct wpa_supplicant *wpa_s, const u8 *src,
}
-void wpas_nan_usd_flush(struct wpa_supplicant *wpa_s)
+void wpas_nan_de_flush(struct wpa_supplicant *wpa_s)
{
if (!wpa_s->nan_de)
return;
@@ -549,10 +549,10 @@ void wpas_nan_usd_flush(struct wpa_supplicant *wpa_s)
}
-int wpas_nan_usd_publish(struct wpa_supplicant *wpa_s, const char *service_name,
- enum nan_service_protocol_type srv_proto_type,
- const struct wpabuf *ssi,
- struct nan_publish_params *params, bool p2p)
+int wpas_nan_publish(struct wpa_supplicant *wpa_s, const char *service_name,
+ enum nan_service_protocol_type srv_proto_type,
+ const struct wpabuf *ssi,
+ struct nan_publish_params *params, bool p2p)
{
int publish_id;
struct wpabuf *elems = NULL;
@@ -593,7 +593,7 @@ int wpas_nan_usd_publish(struct wpa_supplicant *wpa_s, const char *service_name,
}
-void wpas_nan_usd_cancel_publish(struct wpa_supplicant *wpa_s, int publish_id)
+void wpas_nan_cancel_publish(struct wpa_supplicant *wpa_s, int publish_id)
{
if (!wpa_s->nan_de)
return;
@@ -603,8 +603,8 @@ void wpas_nan_usd_cancel_publish(struct wpa_supplicant *wpa_s, int publish_id)
}
-int wpas_nan_usd_update_publish(struct wpa_supplicant *wpa_s, int publish_id,
- const struct wpabuf *ssi)
+int wpas_nan_update_publish(struct wpa_supplicant *wpa_s, int publish_id,
+ const struct wpabuf *ssi)
{
int ret;
@@ -665,11 +665,11 @@ int wpas_nan_usd_publish_stop_listen(struct wpa_supplicant *wpa_s,
}
-int wpas_nan_usd_subscribe(struct wpa_supplicant *wpa_s,
- const char *service_name,
- enum nan_service_protocol_type srv_proto_type,
- const struct wpabuf *ssi,
- struct nan_subscribe_params *params, bool p2p)
+int wpas_nan_subscribe(struct wpa_supplicant *wpa_s,
+ const char *service_name,
+ enum nan_service_protocol_type srv_proto_type,
+ const struct wpabuf *ssi,
+ struct nan_subscribe_params *params, bool p2p)
{
int subscribe_id;
struct wpabuf *elems = NULL;
@@ -711,8 +711,8 @@ int wpas_nan_usd_subscribe(struct wpa_supplicant *wpa_s,
}
-void wpas_nan_usd_cancel_subscribe(struct wpa_supplicant *wpa_s,
- int subscribe_id)
+void wpas_nan_cancel_subscribe(struct wpa_supplicant *wpa_s,
+ int subscribe_id)
{
if (!wpa_s->nan_de)
return;
@@ -734,9 +734,9 @@ int wpas_nan_usd_subscribe_stop_listen(struct wpa_supplicant *wpa_s,
}
-int wpas_nan_usd_transmit(struct wpa_supplicant *wpa_s, int handle,
- const struct wpabuf *ssi, const struct wpabuf *elems,
- const u8 *peer_addr, u8 req_instance_id)
+int wpas_nan_transmit(struct wpa_supplicant *wpa_s, int handle,
+ const struct wpabuf *ssi, const struct wpabuf *elems,
+ const u8 *peer_addr, u8 req_instance_id)
{
if (!wpa_s->nan_de)
return -1;
diff --git a/wpa_supplicant/nan_supplicant.h b/wpa_supplicant/nan_supplicant.h
index 37d6a710c4..5bb09ae51f 100644
--- a/wpa_supplicant/nan_supplicant.h
+++ b/wpa_supplicant/nan_supplicant.h
@@ -53,35 +53,35 @@ struct nan_subscribe_params;
struct nan_publish_params;
enum nan_service_protocol_type;
-int wpas_nan_usd_init(struct wpa_supplicant *wpa_s);
-void wpas_nan_usd_deinit(struct wpa_supplicant *wpa_s);
-void wpas_nan_usd_rx_sdf(struct wpa_supplicant *wpa_s, const u8 *src,
- const u8 *a3,
- unsigned int freq, const u8 *buf, size_t len);
-void wpas_nan_usd_flush(struct wpa_supplicant *wpa_s);
-int wpas_nan_usd_publish(struct wpa_supplicant *wpa_s, const char *service_name,
- enum nan_service_protocol_type srv_proto_type,
- const struct wpabuf *ssi,
- struct nan_publish_params *params, bool p2p);
-void wpas_nan_usd_cancel_publish(struct wpa_supplicant *wpa_s, int publish_id);
-int wpas_nan_usd_update_publish(struct wpa_supplicant *wpa_s, int publish_id,
- const struct wpabuf *ssi);
+int wpas_nan_de_init(struct wpa_supplicant *wpa_s);
+void wpas_nan_de_deinit(struct wpa_supplicant *wpa_s);
+void wpas_nan_de_rx_sdf(struct wpa_supplicant *wpa_s, const u8 *src,
+ const u8 *a3, unsigned int freq,
+ const u8 *buf, size_t len);
+void wpas_nan_de_flush(struct wpa_supplicant *wpa_s);
+int wpas_nan_publish(struct wpa_supplicant *wpa_s, const char *service_name,
+ enum nan_service_protocol_type srv_proto_type,
+ const struct wpabuf *ssi,
+ struct nan_publish_params *params, bool p2p);
+void wpas_nan_cancel_publish(struct wpa_supplicant *wpa_s, int publish_id);
+int wpas_nan_update_publish(struct wpa_supplicant *wpa_s, int publish_id,
+ const struct wpabuf *ssi);
int wpas_nan_usd_unpause_publish(struct wpa_supplicant *wpa_s, int publish_id,
u8 peer_instance_id, const u8 *peer_addr);
int wpas_nan_usd_publish_stop_listen(struct wpa_supplicant *wpa_s,
int publish_id);
-int wpas_nan_usd_subscribe(struct wpa_supplicant *wpa_s,
- const char *service_name,
- enum nan_service_protocol_type srv_proto_type,
- const struct wpabuf *ssi,
- struct nan_subscribe_params *params, bool p2p);
-void wpas_nan_usd_cancel_subscribe(struct wpa_supplicant *wpa_s,
- int subscribe_id);
+int wpas_nan_subscribe(struct wpa_supplicant *wpa_s,
+ const char *service_name,
+ enum nan_service_protocol_type srv_proto_type,
+ const struct wpabuf *ssi,
+ struct nan_subscribe_params *params, bool p2p);
+void wpas_nan_cancel_subscribe(struct wpa_supplicant *wpa_s,
+ int subscribe_id);
int wpas_nan_usd_subscribe_stop_listen(struct wpa_supplicant *wpa_s,
int subscribe_id);
-int wpas_nan_usd_transmit(struct wpa_supplicant *wpa_s, int handle,
- const struct wpabuf *ssi, const struct wpabuf *elems,
- const u8 *peer_addr, u8 req_instance_id);
+int wpas_nan_transmit(struct wpa_supplicant *wpa_s, int handle,
+ const struct wpabuf *ssi, const struct wpabuf *elems,
+ const u8 *peer_addr, u8 req_instance_id);
void wpas_nan_usd_remain_on_channel_cb(struct wpa_supplicant *wpa_s,
unsigned int freq,
unsigned int duration);
diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
index 3be7617d82..f9eaaf66df 100644
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
@@ -856,7 +856,7 @@ static void wpa_supplicant_cleanup(struct wpa_supplicant *wpa_s)
#endif /* CONFIG_DPP */
#ifdef CONFIG_NAN_USD
- wpas_nan_usd_deinit(wpa_s);
+ wpas_nan_de_deinit(wpa_s);
#endif /* CONFIG_NAN_USD */
#ifdef CONFIG_PASN
@@ -7987,7 +7987,7 @@ static int wpa_supplicant_init_iface(struct wpa_supplicant *wpa_s,
#endif /* CONFIG_DPP */
#ifdef CONFIG_NAN_USD
- if (wpas_nan_usd_init(wpa_s) < 0)
+ if (wpas_nan_de_init(wpa_s) < 0)
return -1;
#endif /* CONFIG_NAN_USD */
--
2.52.0
More information about the Hostap
mailing list