espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-10 16:14:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix_rx_fragment_error_issue' into 'master'

Browse Source 
esp_wifi: fix fragment issue and PMF compatible for faulty APs

Closes WIFI-4218

See merge request espressif/esp-idf!16321
This commit is contained in:
Jiang Jiang Jian
2021-12-13 12:32:33 +00:00
parent 0b77be5108 317a11cb05
commit e3137693c1
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/esp_rom/esp8684/ld/esp8684.rom.ld
View File

@@ -1708,7 +1708,7 @@ ppRecycleAmpdu = 0x40001adc;
ppRecycleRxPkt = 0x40001ae0; ppRecycleRxPkt = 0x40001ae0;
ppResortTxAMPDU = 0x40001ae4; ppResortTxAMPDU = 0x40001ae4;
ppResumeTxAMPDU = 0x40001ae8; ppResumeTxAMPDU = 0x40001ae8;
ppRxFragmentProc = 0x40001aec; /* ppRxFragmentProc = 0x40001aec; */
ppRxPkt = 0x40001af0; ppRxPkt = 0x40001af0;
ppRxProtoProc = 0x40001af4; ppRxProtoProc = 0x40001af4;
ppSearchTxQueue = 0x40001af8; ppSearchTxQueue = 0x40001af8;

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

@@ -228,21 +228,21 @@ extern uint64_t g_wifi_feature_caps;
.feature_caps = g_wifi_feature_caps, \ .feature_caps = g_wifi_feature_caps, \
.sta_disconnected_pm = WIFI_STA_DISCONNECTED_PM_ENABLED, \ .sta_disconnected_pm = WIFI_STA_DISCONNECTED_PM_ENABLED, \
.magic = WIFI_INIT_CONFIG_MAGIC\ .magic = WIFI_INIT_CONFIG_MAGIC\
}; }
/** /**
* @brief Init WiFi * @brief Initialize WiFi
* Alloc resource for WiFi driver, such as WiFi control structure, RX/TX buffer, * Allocate resource for WiFi driver, such as WiFi control structure, RX/TX buffer,
* WiFi NVS structure etc, this WiFi also start WiFi task * WiFi NVS structure etc. This WiFi also starts WiFi task
* *
* @attention 1. This API must be called before all other WiFi API can be called * @attention 1. This API must be called before all other WiFi API can be called
* @attention 2. Always use WIFI_INIT_CONFIG_DEFAULT macro to init the config to default values, this can * @attention 2. Always use WIFI_INIT_CONFIG_DEFAULT macro to initialize the configuration to default values, this can
* guarantee all the fields got correct value when more fields are added into wifi_init_config_t * guarantee all the fields get correct value when more fields are added into wifi_init_config_t
* in future release. If you want to set your owner initial values, overwrite the default values * in future release. If you want to set your own initial values, overwrite the default values
* which are set by WIFI_INIT_CONFIG_DEFAULT, please be notified that the field 'magic' of * which are set by WIFI_INIT_CONFIG_DEFAULT. Please be notified that the field 'magic' of
* wifi_init_config_t should always be WIFI_INIT_CONFIG_MAGIC! * wifi_init_config_t should always be WIFI_INIT_CONFIG_MAGIC!
* *
* @param config pointer to WiFi init configuration structure; can point to a temporary variable. * @param config pointer to WiFi initialized configuration structure; can point to a temporary variable.
* *
* @return * @return
* - ESP_OK: succeed * - ESP_OK: succeed

2
components/esp_wifi/lib

Submodule components/esp_wifi/lib updated: 657dd399cf...ae1371b9a4