From: Jiang Jiang Jian <jack@espressif.com>
Date: Mon, 4 Jun 2018 09:59:05 +0000 (+0800)
Subject: Merge branch 'doc/wifi_channel_state_information' into 'master'
X-Git-Tag: v3.1-beta1~55
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8a4c9d7dfb7879822d17fb67153397de0bf06a9d;p=esp-idf

Merge branch 'doc/wifi_channel_state_information' into 'master'

add document of channel state information

See merge request idf/esp-idf!2468
---

8a4c9d7dfb7879822d17fb67153397de0bf06a9d
diff --cc components/esp32/include/esp_wifi.h
index daaa14f89d,88f0330968..88f0330968
mode 100644,100755..100644
--- a/components/esp32/include/esp_wifi.h
+++ b/components/esp32/include/esp_wifi.h
diff --cc components/esp32/include/esp_wifi_types.h
index 97757f0b8a,a453c427b1..a453c427b1
mode 100644,100755..100644
--- a/components/esp32/include/esp_wifi_types.h
+++ b/components/esp32/include/esp_wifi_types.h
diff --cc docs/en/api-guides/wifi.rst
index aefbb39302,859cf4f650..859cf4f650
mode 100644,100755..100644
--- a/docs/en/api-guides/wifi.rst
+++ b/docs/en/api-guides/wifi.rst