From 0d8cb4445db81a2c1833bbb9ddb33a88a0814937 Mon Sep 17 00:00:00 2001 From: Akshat Agrawal Date: Thu, 25 Jun 2026 09:15:21 +0530 Subject: [PATCH] fix(nan): Move the required variables under the NAN_SYNC block --- components/esp_wifi/wifi_apps/nan_app/src/nan_app.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/components/esp_wifi/wifi_apps/nan_app/src/nan_app.c b/components/esp_wifi/wifi_apps/nan_app/src/nan_app.c index c185d103a56..9b4386fe7f8 100644 --- a/components/esp_wifi/wifi_apps/nan_app/src/nan_app.c +++ b/components/esp_wifi/wifi_apps/nan_app/src/nan_app.c @@ -1650,7 +1650,6 @@ static bool nan_check_paired_service_hash(uint8_t service_hash[6]) uint8_t esp_wifi_nan_publish_service(const wifi_nan_publish_cfg_t *publish_cfg) { int pub_id = 0; - uint8_t service_id[6] = {0}; if (publish_cfg->usd_discovery_flag && !s_usd_in_progress) { ESP_LOGE(TAG, "Can not start Publish function with USD Discovery " @@ -1711,6 +1710,7 @@ uint8_t esp_wifi_nan_publish_service(const wifi_nan_publish_cfg_t *publish_cfg) #ifdef CONFIG_ESP_WIFI_NAN_SYNC_ENABLE wifi_nan_publish_cfg_t *cfg = NULL; + uint8_t service_id[6] = {0}; NAN_DATA_LOCK(); if (!(s_nan_ctx.state & NAN_STARTED_BIT)) { @@ -1840,7 +1840,6 @@ fail: uint8_t esp_wifi_nan_subscribe_service(const wifi_nan_subscribe_cfg_t *subscribe_cfg) { int sub_id = 0; - uint8_t service_id[6] = {0}; if (subscribe_cfg->usd_discovery_flag && !s_usd_in_progress) { ESP_LOGE(TAG, "Can not start Subscribe function with USD Discovery " @@ -1895,6 +1894,8 @@ uint8_t esp_wifi_nan_subscribe_service(const wifi_nan_subscribe_cfg_t *subscribe #endif /* CONFIG_ESP_WIFI_NAN_USD_ENABLE */ #ifdef CONFIG_ESP_WIFI_NAN_SYNC_ENABLE + uint8_t service_id[6] = {0}; + if (subscribe_cfg->security_reqd) { #ifndef CONFIG_ESP_WIFI_NAN_SECURITY ESP_LOGE(TAG, "Encrypted datapath not enabled (CONFIG_ESP_WIFI_NAN_SECURITY)");