Merge branch 'bugfix/nan_sd_dp_timer_fixes_v5.1' into 'release/v5.1'

Fix NAN service discovery, datapath and timer bugs (Backport v5.1) See merge request espressif/esp-idf!27522
espressif · Dec 7, 2023 · fb511f4 · fb511f4
2 parents 493ecf5 + 9cdf839
commit fb511f4
Show file tree

Hide file tree

Showing 4 changed files with 187 additions and 51 deletions.
diff --git a/components/esp_rom/esp32c2/ld/esp32c2.rom.ld b/components/esp_rom/esp32c2/ld/esp32c2.rom.ld
@@ -1620,7 +1620,7 @@ wdev_mac_sleep = 0x40001d04;
 wdevProcessRxSucDataAll = 0x40001d10;
 wdev_csi_len_align = 0x40001d14;
 ppDequeueTxDone_Locked = 0x40001d18;
-ppProcTxDone = 0x40001d1c;
+/*ppProcTxDone = 0x40001d1c;*/
 /*pm_tx_data_done_process = 0x40001d20;*/
 config_is_cache_tx_buf_enabled = 0x40001d24;
 ppMapWaitTxq = 0x40001d28;

diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib
diff --git a/components/esp_wifi/wifi_apps/include/esp_nan.h b/components/esp_wifi/wifi_apps/include/esp_nan.h
@@ -128,7 +128,7 @@ uint8_t esp_wifi_nan_datapath_req(wifi_nan_datapath_req_t *req);
 /**
   * @brief      Respond to a NAN Datapath request with Accept or Reject
   *
-  * @attention  This API should be called if ndp_auto_accept is not set True by the Publisher and
+  * @attention  This API should be called if ndp_resp_needed is set True by the Publisher and
   *             a WIFI_EVENT_NDP_INDICATION event is received due to an incoming NDP request.
   *
   * @param      resp  NAN Datapath Response parameters.