Explorar o código

Merge branch 'bugfix/fix_rx_fragment_error_issue_v4.1' into 'release/v4.1'

esp_wifi: fix fragment issue and PMF compatible for faulty APs(Backport v4.1)

See merge request espressif/esp-idf!16400
Jiang Jiang Jian %!s(int64=4) %!d(string=hai) anos
pai
achega
6cd99a7ebd
Modificáronse 2 ficheiros con 10 adicións e 10 borrados
  1. 9 9
      components/esp_wifi/include/esp_wifi.h
  2. 1 1
      components/esp_wifi/lib

+ 9 - 9
components/esp_wifi/include/esp_wifi.h

@@ -215,21 +215,21 @@ extern uint64_t g_wifi_feature_caps;
     .mgmt_sbuf_num = WIFI_MGMT_SBUF_NUM, \
     .feature_caps = g_wifi_feature_caps, \
     .magic = WIFI_INIT_CONFIG_MAGIC\
-};
+}
 
 /**
-  * @brief  Init WiFi
-  *         Alloc resource for WiFi driver, such as WiFi control structure, RX/TX buffer,
-  *         WiFi NVS structure etc, this WiFi also start WiFi task
+  * @brief  Initialize WiFi
+  *         Allocate resource for WiFi driver, such as WiFi control structure, RX/TX buffer,
+  *         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 2. Always use WIFI_INIT_CONFIG_DEFAULT macro to init the config to default values, this can
-  *               guarantee all the fields got 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
-  *               which are set by WIFI_INIT_CONFIG_DEFAULT, please be notified that the field 'magic' of 
+  * @attention 2. Always use WIFI_INIT_CONFIG_DEFAULT macro to initialize the configuration to default values, this can
+  *               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 own initial values, overwrite the default values
+  *               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!
   *
-  * @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
   *    - ESP_OK: succeed

+ 1 - 1
components/esp_wifi/lib

@@ -1 +1 @@
-Subproject commit 06476afc5786185031cd1d0488a21086a3a89144
+Subproject commit 127aa3bba9effe0976e5de30d89107318be3cc34