Merge branch 'bugfix/esp32s2_fail_to_scan_after_recv_disassoc' into '…

…master' esp_wifi: fix fail to scan after recv disassoc/deauth for esp32s2 Closes WIFI-4539 See merge request espressif/esp-idf!19407
espressif · Aug 9, 2022 · f444aa4 · f444aa4
2 parents d622bcf + 73817d8
commit f444aa4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/components/esp_wifi/esp32s2/esp_adapter.c b/components/esp_wifi/esp32s2/esp_adapter.c
@@ -787,6 +787,8 @@ wifi_osi_funcs_t g_wifi_osi_funcs = {
     ._wifi_apb80m_release = wifi_apb80m_release_wrapper,
     ._phy_disable = esp_phy_disable,
     ._phy_enable = esp_phy_enable,
+    ._phy_common_clock_enable = esp_phy_common_clock_enable,
+    ._phy_common_clock_disable = esp_phy_common_clock_disable,
     ._phy_update_country_info = esp_phy_update_country_info,
     ._read_mac = esp_read_mac,
     ._timer_arm = timer_arm_wrapper,

diff --git a/components/esp_wifi/include/esp_private/wifi_os_adapter.h b/components/esp_wifi/include/esp_private/wifi_os_adapter.h
@@ -77,7 +77,7 @@ typedef struct {
     void (* _wifi_apb80m_release)(void);
     void (* _phy_disable)(void);
     void (* _phy_enable)(void);
-#if CONFIG_IDF_TARGET_ESP32
+#if CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32S2
     void (* _phy_common_clock_enable)(void);
     void (* _phy_common_clock_disable)(void);
 #endif

diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib