blackbeard420/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf synced 2025-03-12 02:29:10 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'bugfix/backport_some_wifi_bugs_0107_v4.0' into 'release/v4.0'

Browse Source 
backport some Wi-Fi bugs 0107 (backport v4.0)

See merge request espressif/esp-idf!7260
This commit is contained in:
Jiang Jiang Jian 2020-02-17 20:44:50 +08:00
commit 0f64291700
5 changed files with 44 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
components/esp_wifi/include/esp_private/wifi.h
View File

@ -377,6 +377,43 @@ esp_err_t esp_wifi_internal_get_log(wifi_log_level_t *log_level, uint32_t *log_m
*/
esp_err_t esp_wifi_internal_ioctl(int cmd, wifi_ioctl_config_t *cfg);
/**
* @brief Get the user-configured channel info
*
* @param ifx : WiFi interface
* @param primary : store the configured primary channel
* @param second : store the configured second channel
*
* @return
* - ESP_OK: succeed
*/
esp_err_t esp_wifi_internal_get_config_channel(wifi_interface_t ifx, uint8_t *primary, uint8_t *second);
/**
* @brief Get the negotiated channel info after WiFi connection established
*
* @param ifx : WiFi interface
* @param aid : the connection number when a STA connects to the softAP
* @param primary : store the negotiated primary channel
* @param second : store the negotiated second channel
* @attention the aid param is only works when the ESP32 in softAP/softAP+STA mode
*
* @return
* - ESP_OK: succeed
*/
esp_err_t esp_wifi_internal_get_negotiated_channel(wifi_interface_t ifx, uint8_t aid, uint8_t *primary, uint8_t *second);
/**
* @brief Get the negotiated bandwidth info after WiFi connection established
*
* @param ifx : WiFi interface
* @param bw : store the negotiated bandwidth
*
* @return
* - ESP_OK: succeed
*/
esp_err_t esp_wifi_internal_get_negotiated_bandwidth(wifi_interface_t ifx, uint8_t aid, uint8_t *bw);
#ifdef __cplusplus
}
#endif

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

@ -542,8 +542,10 @@ esp_err_t esp_wifi_get_bandwidth(wifi_interface_t ifx, wifi_bandwidth_t *bw);
/**
* @brief Set primary/secondary channel of ESP32
*
* @attention 1. This is a special API for sniffer
* @attention 2. This API should be called after esp_wifi_start() and esp_wifi_set_promiscuous()
* @attention 1. This API should be called after esp_wifi_start()
* @attention 2. When ESP32 is in STA mode, this API should not be called when STA is scanning or connecting to an external AP
* @attention 3. When ESP32 is in softAP mode, this API should not be called when softAP has connected to external STAs
* @attention 4. When ESP32 is in STA+softAP mode, this API should not be called when in the scenarios described above
*
* @param primary for HT20, primary is the channel number, for HT40, primary is the primary channel
* @param second for HT20, second is ignored, for HT40, second is the second channel

2
components/esp_wifi/lib_esp32

@ -1 +1 @@
Subproject commit fc48978e6237b0f116c8cef2a685d578b922ca65
Subproject commit 6de7aa2cd72eb9a423378cf5e4f7e80df091fbca

2
components/lwip/Kconfig
View File

@ -92,7 +92,7 @@ menu "LWIP"
config LWIP_IP_FRAG
bool "Enable fragment outgoing IP packets"
default n
default y
help
Enabling this option allows fragmenting outgoing IP packets if their size
exceeds MTU.

2
components/lwip/lwip

@ -1 +1 @@
Subproject commit c9e3b53c6f04052943f97210b858cec805cc98d9
Subproject commit b4eaf11fe5e980a2d9b655e6617d4163c11465ec