Merge branch 'bugfix/ap_second_channel_update_error' into 'master'

jack0c · jack0c · commit 8b67370e6558 · 2020-04-29T11:59:11.000+08:00
wifi: fix the bug for softAP update second channel wrong

Closes WIFI-1785, WIFI-1784, WIFI-1630, WIFI-1857, WIFI-1849, and WIFI-1997

See merge request espressif/esp-idf!8023
diff --git a/components/esp_wifi/include/esp_wifi_types.h b/components/esp_wifi/include/esp_wifi_types.h
@@ -114,7 +114,7 @@ typedef struct {
 } wifi_active_scan_time_t;
 
 /** @brief Aggregate of active & passive scan time per channel */
-typedef union {
+typedef struct {
     wifi_active_scan_time_t active;  /**< active scan time per channel, units: millisecond. */
     uint32_t passive;                /**< passive scan time per channel, units: millisecond, values above 1500ms may
                                           cause station to disconnect from AP and are not recommended. */
diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib
@@ -1 +1 @@
-Subproject commit f16b635326cced7bf582b3abd2e800c3e0694b0a
+Subproject commit 696c211b2321c4ac3d651fa524ba5326f59f47cf
