From a0d61eca20ed15a7dcc16171611a0856409d6cb3 Mon Sep 17 00:00:00 2001
From: liu zhifu <liuzhifu@espressif.com>
Date: Tue, 31 Mar 2020 18:05:40 +0800
Subject: [PATCH] esp32: backport some WiFi fixes to v3.3

Backport following Wifi fixes:

1. Optimize WiFi sleep in WiFi/BT coexist mode
   I> If any data TX/RX in WiFi slice, force wakeup next TBTT
   II> Increase active timeout to coex TBTT to avoid sleep in WiFi slice

2. Fix esp_wifi_stop() crash
   esp_wifi_stop() crashes if it's called when WiFi is not initialized.

3. Fix WiFi log print level

4. Return fails if AP's configuring AP channel is out of range

5. esp_wifi_sta_get_ap_info() returns actual values of group ciphers
---
 components/esp32/lib                                     | 2 +-
 components/idf_test/integration_test/TC_IT_WIFI_CONN.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/esp32/lib b/components/esp32/lib
index 5750c9e9a..19aa91f2c 160000
--- a/components/esp32/lib
+++ b/components/esp32/lib
@@ -1 +1 @@
-Subproject commit 5750c9e9a3134b17e72688b419b0277958817187
+Subproject commit 19aa91f2c1977a75a355433213e5ee46e67190d8
diff --git a/components/idf_test/integration_test/TC_IT_WIFI_CONN.yml b/components/idf_test/integration_test/TC_IT_WIFI_CONN.yml
index b39772188..8a9c23683 100644
--- a/components/idf_test/integration_test/TC_IT_WIFI_CONN.yml
+++ b/components/idf_test/integration_test/TC_IT_WIFI_CONN.yml
@@ -78,7 +78,7 @@ test cases:
   - - SSC SSC2 sta -C -s <target_ssid>
     - - R SSC2 RE "\+JAP:CONNECTED,%%s"%%(<target_ssid>)
   - - SSC SSC1 ap -S -s <target_ssid> -n 15
-    - - R SSC1 C +SAP:OK
+    - - R SSC1 C +SAP:ERROR
   - - SSC SSC2 sta -C -s <target_ssid>
     - - R SSC2 RE "\+JAP:CONNECTED,%%s"%%(<target_ssid>)
   - - SSC SSC2 sta -D