From fb15403515bae71036740b7e1850d87259815632 Mon Sep 17 00:00:00 2001 From: zhangyanjiao Date: Wed, 13 Feb 2019 17:37:53 +0800 Subject: [PATCH] wifi changes: 1. make menuconfig can set the WiFi mgmt short buffer num 2. fix several scan bugs --- components/esp32/Kconfig | 7 +++++++ components/esp32/include/esp_wifi.h | 8 ++++++++ components/esp32/lib | 2 +- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/components/esp32/Kconfig b/components/esp32/Kconfig index 3cfbcd0d6..d577afd5f 100644 --- a/components/esp32/Kconfig +++ b/components/esp32/Kconfig @@ -1051,6 +1051,13 @@ config ESP32_WIFI_IRAM_OPT 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. +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 menu PHY diff --git a/components/esp32/include/esp_wifi.h b/components/esp32/include/esp_wifi.h index c9899fa7c..3348f8f4e 100644 --- a/components/esp32/include/esp_wifi.h +++ b/components/esp32/include/esp_wifi.h @@ -110,6 +110,7 @@ typedef struct { int rx_ba_win; /**< WiFi Block Ack RX window size */ int wifi_task_core_id; /**< WiFi Task Core ID */ 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 */ } 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 #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() { \ .event_handler = &esp_event_send, \ .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,\ .wifi_task_core_id = WIFI_TASK_CORE_ID,\ .beacon_max_len = WIFI_SOFTAP_BEACON_MAX_LEN, \ + .mgmt_sbuf_num = WIFI_MGMT_SBUF_NUM, \ .magic = WIFI_INIT_CONFIG_MAGIC\ }; diff --git a/components/esp32/lib b/components/esp32/lib index 5108361b0..12fd11017 160000 --- a/components/esp32/lib +++ b/components/esp32/lib @@ -1 +1 @@ -Subproject commit 5108361b0fb6f7f4b36a00a912b537ac0c07b282 +Subproject commit 12fd110171caed21d605d7174faee536735e099d