Merge branch 'bugfix/backport_some_wifi_fixes_1009_v3.1' into 'releas…

…e/v3.1' esp32: fix some WiFi fixes 1009 (backport v3.1) See merge request espressif/esp-idf!6297
espressif · Oct 21, 2019 · 0c7e781 · 0c7e781
2 parents 2981e2e + 907878d
commit 0c7e781
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 27 deletions.
diff --git 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
@@ -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
diff --git a/components/esp32/test/test_wifi_lib_git_commit.c b/components/esp32/test/test_wifi_lib_git_commit.c
+26 −0		.gitlab-ci.yml
+ −		libcoexist.a
+ −		libcore.a
+ −		libespnow.a
+ −		libmesh.a
+ −		libnet80211.a
+ −		libpp.a
+ −		libsmartconfig.a
+ −		libwpa.a
+ −		libwpa2.a
+ −		libwps.a