diff --git a/components/esp_coex/lib b/components/esp_coex/lib index cb6667841f..c62361f19c 160000 --- a/components/esp_coex/lib +++ b/components/esp_coex/lib @@ -1 +1 @@ -Subproject commit cb6667841f63457246d56a9170f3409917e9d5a8 +Subproject commit c62361f19c98a448255b53f8d31d3a23597e01e3 diff --git a/components/esp_rom/esp32c5/ld/esp32c5.rom.pp.ld b/components/esp_rom/esp32c5/ld/esp32c5.rom.pp.ld index 0f66f607be..645b85c724 100644 --- a/components/esp_rom/esp32c5/ld/esp32c5.rom.pp.ld +++ b/components/esp_rom/esp32c5/ld/esp32c5.rom.pp.ld @@ -154,11 +154,11 @@ pm_beacon_monitor_tbtt_timeout_process = 0x40000e00; pm_update_next_tbtt = 0x40000e04; pm_twt_disallow_tx = 0x40000e08; pm_clear_wakeup_signal = 0x40000e0c; -/*pm_mac_disable_tsf_tbtt_soc_wakeup = 0x40000e10; -pm_mac_disable_tsf_tbtt_modem_wakeup = 0x40000e14; +//pm_mac_disable_tsf_tbtt_soc_wakeup = 0x40000e10; +//pm_mac_disable_tsf_tbtt_modem_wakeup = 0x40000e14; //pm_mac_enable_tsf_tbtt_soc_wakeup = 0x40000e18; //pm_mac_enable_tsf_tbtt_modem_wakeup = 0x40000e1c; -//pm_mac_modem_params_rt_update = 0x40000e20;*/ +//pm_mac_modem_params_rt_update = 0x40000e20; pm_update_at_next_beacon = 0x40000e24; tbtt_adaptive_setup = 0x40000e28; tbtt_adaptive_servo = 0x40000e2c; diff --git a/components/esp_wifi/include/esp_wifi_types_generic.h b/components/esp_wifi/include/esp_wifi_types_generic.h index 2cc2fa008a..6c186b8785 100644 --- a/components/esp_wifi/include/esp_wifi_types_generic.h +++ b/components/esp_wifi/include/esp_wifi_types_generic.h @@ -1467,7 +1467,7 @@ typedef struct { bool dcm; /**< Using dcm rate to send frame */ } wifi_tx_rate_config_t; -#define WIFI_MAX_SUPPORT_COUNTRY_NUM 175 /**< max number of supported countries */ +#define WIFI_MAX_SUPPORT_COUNTRY_NUM 176 /**< max number of supported countries */ #ifdef CONFIG_SOC_WIFI_SUPPORT_5G #define WIFI_MAX_REGULATORY_RULE_NUM 7 /**< max number of regulatory rules */ #else diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib index 583c685668..ead6707574 160000 --- a/components/esp_wifi/lib +++ b/components/esp_wifi/lib @@ -1 +1 @@ -Subproject commit 583c685668cc420e60f5f22148ddf10c32e94cc3 +Subproject commit ead67075744bacebf3f7986911d5c7e7ee7a7183 diff --git a/components/esp_wifi/regulatory/esp_wifi_regulatory.c b/components/esp_wifi/regulatory/esp_wifi_regulatory.c index c11c33f2ed..2003b302cc 100644 --- a/components/esp_wifi/regulatory/esp_wifi_regulatory.c +++ b/components/esp_wifi/regulatory/esp_wifi_regulatory.c @@ -89,6 +89,7 @@ typedef enum { const wifi_regdomain_t regdomain_table[WIFI_MAX_SUPPORT_COUNTRY_NUM] = { {"01", ESP_WIFI_REGULATORY_TYPE_DEFAULT}, + {"EU", ESP_WIFI_REGULATORY_TYPE_CE}, {"AD", ESP_WIFI_REGULATORY_TYPE_CE}, {"AE", ESP_WIFI_REGULATORY_TYPE_IFETEL}, {"AF", ESP_WIFI_REGULATORY_TYPE_AF}, @@ -1067,6 +1068,7 @@ typedef enum { const wifi_regdomain_t regdomain_table[WIFI_MAX_SUPPORT_COUNTRY_NUM] = { {"01", ESP_WIFI_REGULATORY_TYPE_DEFAULT}, + {"EU", ESP_WIFI_REGULATORY_TYPE_CE}, {"AD", ESP_WIFI_REGULATORY_TYPE_CE}, {"AE", ESP_WIFI_REGULATORY_TYPE_CE}, {"AF", ESP_WIFI_REGULATORY_TYPE_CE}, diff --git a/components/esp_wifi/regulatory/esp_wifi_regulatory.txt b/components/esp_wifi/regulatory/esp_wifi_regulatory.txt index 22c96d3381..ade4bbeaac 100644 --- a/components/esp_wifi/regulatory/esp_wifi_regulatory.txt +++ b/components/esp_wifi/regulatory/esp_wifi_regulatory.txt @@ -44,6 +44,17 @@ country 01: # Channel 52 - 64 (5250 - 5330 @ 80), (20), NO-IR, DFS, AUTO-BW +# EU decision 2005/513/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02005D0513-20070213 +# EU decision 2006/771/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02008D0432-20080611 +# Harmonized CEPT countries: https://www.ecodocdb.dk/download/25c41779-cd6e/Rec7003e.pdf +country EU: DFS-ETSI + (2400 - 2483.5 @ 40), (100 mW) + (5150 - 5250 @ 80), (200 mW), NO-OUTDOOR, AUTO-BW, wmmrule=ETSI + (5250 - 5350 @ 80), (100 mW), NO-OUTDOOR, DFS, AUTO-BW, wmmrule=ETSI + (5470 - 5725 @ 160), (500 mW), DFS, wmmrule=ETSI + # short range devices (ETSI EN 300 440-1) + (5725 - 5875 @ 80), (25 mW) + # AD as part of CEPT accepted decisions 2005/513/EC (5GHz RLAN, EN 301 893) # and 2006/771/EC (amended by 2008/432/EC, Short-Range Devices, EN 300 440) # EU decision 2005/513/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02005D0513-20070213 diff --git a/components/wpa_supplicant/esp_supplicant/src/esp_hostap.c b/components/wpa_supplicant/esp_supplicant/src/esp_hostap.c index 45b7e90768..9df1087a27 100644 --- a/components/wpa_supplicant/esp_supplicant/src/esp_hostap.c +++ b/components/wpa_supplicant/esp_supplicant/src/esp_hostap.c @@ -158,7 +158,7 @@ void *hostap_init(void) auth_conf->group_mgmt_cipher = WPA_CIPHER_BIP_GMAC_256; break; default: - wpa_printf(MSG_DEBUG, "Invalid pairwise cipher (0x%x)", pairwise_cipher); + auth_conf->group_mgmt_cipher = WPA_CIPHER_AES_128_CMAC; } } if (authmode == WIFI_AUTH_WPA2_WPA3_PSK) {