feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'bugfix/fix_deinit_return_ok_when_wifi_no_longer_initialized_issue_v4.4' into 'release/v4.4'

Browse Source 
esp_wifi: fix fail to scan after recv disassoc/deauth for esp32s2(Backport v4.4)

See merge request espressif/esp-idf!20410
This commit is contained in:
Jiang Jiang Jian
2022-09-29 19:20:48 +08:00
parent e85c5822a2 7f2d6e96b4
commit 9269a536ac
4 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/esp_wifi/esp32s2/esp_adapter.c
View File

@@ -775,6 +775,8 @@ wifi_osi_funcs_t g_wifi_osi_funcs = {
._wifi_apb80m_release = wifi_apb80m_release_wrapper, ._wifi_apb80m_release = wifi_apb80m_release_wrapper,
._phy_disable = esp_phy_disable, ._phy_disable = esp_phy_disable,
._phy_enable = esp_phy_enable, ._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, ._phy_update_country_info = esp_phy_update_country_info,
._read_mac = esp_read_mac, ._read_mac = esp_read_mac,
._timer_arm = timer_arm_wrapper, ._timer_arm = timer_arm_wrapper,

2
components/esp_wifi/include/esp_private/wifi_os_adapter.h
View File

@@ -77,7 +77,7 @@ typedef struct {
void (* _wifi_apb80m_release)(void); void (* _wifi_apb80m_release)(void);
void (* _phy_disable)(void); void (* _phy_disable)(void);
void (* _phy_enable)(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_enable)(void);
void (* _phy_common_clock_disable)(void); void (* _phy_common_clock_disable)(void);
#endif #endif

2
components/esp_wifi/include/esp_wifi.h
View File

@@ -339,7 +339,7 @@ esp_err_t esp_wifi_restore(void);
* *
* @attention 1. This API only impact WIFI_MODE_STA or WIFI_MODE_APSTA mode * @attention 1. This API only impact WIFI_MODE_STA or WIFI_MODE_APSTA mode
* @attention 2. If the ESP32 is connected to an AP, call esp_wifi_disconnect to disconnect. * @attention 2. If the ESP32 is connected to an AP, call esp_wifi_disconnect to disconnect.
* @attention 3. The scanning triggered by esp_wifi_start_scan() will not be effective until connection between ESP32 and the AP is established. * @attention 3. The scanning triggered by esp_wifi_scan_start() will not be effective until connection between ESP32 and the AP is established.
* If ESP32 is scanning and connecting at the same time, ESP32 will abort scanning and return a warning message and error * If ESP32 is scanning and connecting at the same time, ESP32 will abort scanning and return a warning message and error
* number ESP_ERR_WIFI_STATE. * number ESP_ERR_WIFI_STATE.
* If you want to do reconnection after ESP32 received disconnect event, remember to add the maximum retry time, otherwise the called * If you want to do reconnection after ESP32 received disconnect event, remember to add the maximum retry time, otherwise the called

2
components/esp_wifi/lib

Submodule components/esp_wifi/lib updated: 04ccb7f7d1...bae5782cf8