From 907878d606f152e6cf409774e8ebb78ab24b17ca Mon Sep 17 00:00:00 2001
From: liu zhifu <liuzhifu@espressif.com>
Date: Wed, 9 Oct 2019 20:51:26 +0800
Subject: [PATCH] esp32: fix some WiFi fixes

Fix following wifi bugs:
1. Fix the bug for API_CHECK_ENABLED
2. Fix the bug that wpa2 enterprise sta can connect open AP
3. Fix TKIP/CCMP PN replay attack detection bug
4. Increase buffer number type from uint8_t to uint16_t to support more than 255 buffers
5. Avoid recalculating PMK if esp_wifi_set_config() is not called
6. Fix the bug that WiFi stop leads to task watchdog
7. Fix smartconfig IPC crash
8. Fix 5.5M signal test bug
9. Move wifi library check to esp32-wifi-lib ci
---
 components/esp32/include/esp_wifi.h              |  2 +-
 components/esp32/include/esp_wifi_internal.h     | 11 -----------
 components/esp32/lib                             |  2 +-
 components/esp32/test/test_wifi_lib_git_commit.c | 14 --------------
 4 files changed, 2 insertions(+), 27 deletions(-)
 delete mode 100644 components/esp32/test/test_wifi_lib_git_commit.c

diff --git a/components/esp32/include/esp_wifi.h b/components/esp32/include/esp_wifi.h
index 57014b8d9..3285fd350 100644
--- a/components/esp32/include/esp_wifi.h
+++ b/components/esp32/include/esp_wifi.h
@@ -543,7 +543,7 @@ 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() or esp_wifi_set_promiscuous()
+  * @attention 2. This API should be called after esp_wifi_start() and esp_wifi_set_promiscuous()
   *
   * @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
diff --git a/components/esp32/include/esp_wifi_internal.h b/components/esp32/include/esp_wifi_internal.h
index 967c5d01e..659725680 100644
--- a/components/esp32/include/esp_wifi_internal.h
+++ b/components/esp32/include/esp_wifi_internal.h
@@ -171,17 +171,6 @@ esp_err_t esp_wifi_internal_wifi_type_md5_check(const char *md5);
   */
 esp_err_t esp_wifi_internal_esp_wifi_md5_check(const char *md5);
 
-/**
-  * @brief     Check the git commit id of WiFi library
-  *
-  * @attention 1. It is used for internal CI WiFi library check
-  *
-  * @return
-  *     - ESP_OK : succeed
-  *     - ESP_FAIL : fail
-  */
-esp_err_t esp_wifi_internal_git_commit_id_check(void);
-
 /**
   * @brief     Allocate a chunk of memory for WiFi driver
   *
diff --git a/components/esp32/lib b/components/esp32/lib
index 78088da39..deea532dc 160000
--- a/components/esp32/lib
+++ b/components/esp32/lib
@@ -1 +1 @@
-Subproject commit 78088da39dbe2fbb82f6bdd8e6db30cda8d0cd4a
+Subproject commit deea532dc8e532f30154193df7ac4087f7d4ab55
diff --git a/components/esp32/test/test_wifi_lib_git_commit.c b/components/esp32/test/test_wifi_lib_git_commit.c
deleted file mode 100644
index 8b5633f9b..000000000
--- a/components/esp32/test/test_wifi_lib_git_commit.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- Tests for the Wi-Fi
-*/
-#include "unity.h"
-#include "esp_log.h"
-#include "esp_wifi_internal.h"
-
-static const char* TAG = "test_wifi_lib_git_commit_id";
-
-TEST_CASE("wifi lib git commit id","[wifi]")
-{    
-    TEST_ESP_OK( esp_wifi_internal_git_commit_id_check() );
-}
-