Merge branch 'bugfix/fix_scan_and_connect_bugs_0415_v3.2' into 'release/v3.2'
fix wifi scan and connect bugs (backport v3.2) See merge request idf/esp-idf!4772
This commit is contained in:
commit
c7d0df5451
4 changed files with 17 additions and 1 deletions
|
@ -1180,6 +1180,13 @@ config ESP32_WIFI_IRAM_OPT
|
||||||
Select this option to place frequently called Wi-Fi library functions in IRAM. When this option is disabled,
|
Select this option to place frequently called Wi-Fi library functions in IRAM. When this option is disabled,
|
||||||
more than 10Kbytes of IRAM memory will be saved but Wi-Fi throughput will be reduced.
|
more than 10Kbytes of IRAM memory will be saved but Wi-Fi throughput will be reduced.
|
||||||
|
|
||||||
|
config ESP32_WIFI_MGMT_SBUF_NUM
|
||||||
|
int "WiFi mgmt short buffer number"
|
||||||
|
range 6 32
|
||||||
|
default 32
|
||||||
|
help
|
||||||
|
Set the number of WiFi management short buffer.
|
||||||
|
|
||||||
endmenu # Wi-Fi
|
endmenu # Wi-Fi
|
||||||
|
|
||||||
menu PHY
|
menu PHY
|
||||||
|
|
|
@ -110,6 +110,7 @@ typedef struct {
|
||||||
int rx_ba_win; /**< WiFi Block Ack RX window size */
|
int rx_ba_win; /**< WiFi Block Ack RX window size */
|
||||||
int wifi_task_core_id; /**< WiFi Task Core ID */
|
int wifi_task_core_id; /**< WiFi Task Core ID */
|
||||||
int beacon_max_len; /**< WiFi softAP maximum length of the beacon */
|
int beacon_max_len; /**< WiFi softAP maximum length of the beacon */
|
||||||
|
int mgmt_sbuf_num; /**< WiFi management short buffer number, the minimum value is 6, the maximum value is 32 */
|
||||||
int magic; /**< WiFi init magic number, it should be the last field */
|
int magic; /**< WiFi init magic number, it should be the last field */
|
||||||
} wifi_init_config_t;
|
} wifi_init_config_t;
|
||||||
|
|
||||||
|
@ -183,6 +184,12 @@ extern const wpa_crypto_funcs_t g_wifi_default_wpa_crypto_funcs;
|
||||||
#define WIFI_SOFTAP_BEACON_MAX_LEN 752
|
#define WIFI_SOFTAP_BEACON_MAX_LEN 752
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef CONFIG_ESP32_WIFI_MGMT_SBUF_NUM
|
||||||
|
#define WIFI_MGMT_SBUF_NUM CONFIG_ESP32_WIFI_MGMT_SBUF_NUM
|
||||||
|
#else
|
||||||
|
#define WIFI_MGMT_SBUF_NUM 32
|
||||||
|
#endif
|
||||||
|
|
||||||
#define WIFI_INIT_CONFIG_DEFAULT() { \
|
#define WIFI_INIT_CONFIG_DEFAULT() { \
|
||||||
.event_handler = &esp_event_send, \
|
.event_handler = &esp_event_send, \
|
||||||
.osi_funcs = &g_wifi_osi_funcs, \
|
.osi_funcs = &g_wifi_osi_funcs, \
|
||||||
|
@ -201,6 +208,7 @@ extern const wpa_crypto_funcs_t g_wifi_default_wpa_crypto_funcs;
|
||||||
.rx_ba_win = WIFI_DEFAULT_RX_BA_WIN,\
|
.rx_ba_win = WIFI_DEFAULT_RX_BA_WIN,\
|
||||||
.wifi_task_core_id = WIFI_TASK_CORE_ID,\
|
.wifi_task_core_id = WIFI_TASK_CORE_ID,\
|
||||||
.beacon_max_len = WIFI_SOFTAP_BEACON_MAX_LEN, \
|
.beacon_max_len = WIFI_SOFTAP_BEACON_MAX_LEN, \
|
||||||
|
.mgmt_sbuf_num = WIFI_MGMT_SBUF_NUM, \
|
||||||
.magic = WIFI_INIT_CONFIG_MAGIC\
|
.magic = WIFI_INIT_CONFIG_MAGIC\
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -93,6 +93,7 @@ typedef enum {
|
||||||
WIFI_REASON_AUTH_FAIL = 202,
|
WIFI_REASON_AUTH_FAIL = 202,
|
||||||
WIFI_REASON_ASSOC_FAIL = 203,
|
WIFI_REASON_ASSOC_FAIL = 203,
|
||||||
WIFI_REASON_HANDSHAKE_TIMEOUT = 204,
|
WIFI_REASON_HANDSHAKE_TIMEOUT = 204,
|
||||||
|
WIFI_REASON_CONNECTION_FAIL = 205,
|
||||||
} wifi_err_reason_t;
|
} wifi_err_reason_t;
|
||||||
|
|
||||||
typedef enum {
|
typedef enum {
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 4b59590d302c7cd467d719168185612ce87cbfb8
|
Subproject commit 1ea7cb7731136c2f59c9e335e8b490a11773c348
|
Loading…
Reference in a new issue