From a8ede32979735bd1ae872c6dc45a13aec3227a26 Mon Sep 17 00:00:00 2001 From: yinqingzhao Date: Mon, 23 Sep 2024 15:16:02 +0800 Subject: [PATCH] fix(wifi): modify some SOC_WIFI_SUPPORT_5G to CONFIG_SOC_WIFI_SUPPORT_5G --- components/esp_wifi/include/esp_wifi_types_generic.h | 2 +- components/esp_wifi/lib | 2 +- components/wpa_supplicant/src/common/ieee802_11_common.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/esp_wifi/include/esp_wifi_types_generic.h b/components/esp_wifi/include/esp_wifi_types_generic.h index 536b0a3c52..3e49682df5 100644 --- a/components/esp_wifi/include/esp_wifi_types_generic.h +++ b/components/esp_wifi/include/esp_wifi_types_generic.h @@ -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. diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib index 80250846cb..eae9d940fc 160000 --- a/components/esp_wifi/lib +++ b/components/esp_wifi/lib @@ -1 +1 @@ -Subproject commit 80250846cbb607d1a90e03d61aa7dd8ef13e6611 +Subproject commit eae9d940fca58d6f7e27bbb4f875e143e97ad1a5 diff --git a/components/wpa_supplicant/src/common/ieee802_11_common.c b/components/wpa_supplicant/src/common/ieee802_11_common.c index 1c24c1972b..5af7ee47d9 100644 --- a/components/wpa_supplicant/src/common/ieee802_11_common.c +++ b/components/wpa_supplicant/src/common/ieee802_11_common.c @@ -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;