alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix(wifi): modify some SOC_WIFI_SUPPORT_5G to CONFIG_SOC_WIFI_SUPPORT_5G

Browse Source
This commit is contained in:
yinqingzhao 2024-09-23 15:16:02 +08:00
parent e990d1e06d
commit a8ede32979
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/esp_wifi/include/esp_wifi_types_generic.h
View File

@ -53,7 +53,7 @@ typedef struct {
uint8_t nchan; /**< total channel number of the allowed 2.4GHz WiFi channels */
int8_t max_tx_power; /**< This field is used for getting WiFi maximum transmitting power, call esp_wifi_set_max_tx_power to set the maximum transmitting power. */
wifi_country_policy_t policy; /**< country policy */
#if SOC_WIFI_SUPPORT_5G
#if CONFIG_SOC_WIFI_SUPPORT_5G
uint32_t wifi_5g_channel_mask; /**< A bitmask representing the allowed 5GHz WiFi channels.
Each bit in the mask corresponds to a specific channel as wifi_5g_channel_bit_t shown.
Bitmask set to 0 indicates 5GHz channels are allowed according to local regulatory rules.

2
components/esp_wifi/lib

@ -1 +1 @@
Subproject commit 80250846cbb607d1a90e03d61aa7dd8ef13e6611
Subproject commit eae9d940fca58d6f7e27bbb4f875e143e97ad1a5

2
components/wpa_supplicant/src/common/ieee802_11_common.c
View File

@ -371,7 +371,7 @@ u8 get_operating_class(u8 chan, int sec_channel)
if (chan == 14)
op_class = 82;
#if SOC_WIFI_SUPPORT_5G
#if CONFIG_SOC_WIFI_SUPPORT_5G
if (chan >= 36 && chan <= 48) {
if (sec_channel == 1)
op_class = 116;