Merge branch 'bugfix/fix_country_policy_issue_v4.3' into 'release/v4.3'

esp_wifi: fix not update phy according to country code.

See merge request espressif/esp-idf!19655
This commit is contained in:
Jiang Jiang Jian
2022-08-21 19:41:07 +08:00
3 changed files with 4 additions and 2 deletions

View File

@ -697,6 +697,8 @@ wifi_osi_funcs_t g_wifi_osi_funcs = {
._wifi_apb80m_release = wifi_apb80m_release_wrapper,
._phy_disable = esp_phy_disable,
._phy_enable = esp_phy_enable,
._phy_common_clock_enable = esp_phy_common_clock_enable,
._phy_common_clock_disable = esp_phy_common_clock_disable,
._phy_update_country_info = esp_phy_update_country_info,
._read_mac = esp_read_mac,
._timer_arm = timer_arm_wrapper,

View File

@ -85,7 +85,7 @@ typedef struct {
void (* _wifi_apb80m_release)(void);
void (* _phy_disable)(void);
void (* _phy_enable)(void);
#if CONFIG_IDF_TARGET_ESP32
#if CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32S2
void (* _phy_common_clock_enable)(void);
void (* _phy_common_clock_disable)(void);
#endif