espressif/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-04-27 19:13:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/backport_wifi_fixes_v6.0' into 'release/v6.0'

Browse Source 
fix(esp_wifi): backport some wifi fixes

See merge request espressif/esp-idf!45567
This commit is contained in:
Jiang Jiang Jian
2026-02-02 10:51:00 +08:00
parent d0f992c02f 56aa9f33eb
commit 987bbd8646
12 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/esp_pm/linker.lf
+7
View File
@@ -94,3 +94,10 @@ entries:
if SOC_TEMP_SENSOR_SUPPORTED = y:
if PM_SLP_IRAM_OPT = y:
temperature_sensor_hal:temperature_sensor_hal_get_raw_value (noflash)
[mapping:esp_hal_gpio_pm]
archive: libesp_hal_gpio.a
entries:
if PM_SLP_IRAM_OPT = y:
if IDF_TARGET_ESP32 = y:
rtc_io_periph:rtc_io_desc (noflash_data)
components/esp_rom/esp32c2/ld/esp32c2.rom.eco4.ld
+1 -1
View File
@@ -15,7 +15,7 @@ esf_buf_recycle = 0x40001ae8;
hal_mac_tx_set_ppdu = 0x40001af8;
ic_mac_deinit = 0x40001b00;
lmacAdjustTimestamp = 0x40001b10;
lmacDiscardMSDU = 0x40001b18;
/*lmacDiscardMSDU = 0x40001b18;*/
lmacEndFrameExchangeSequence = 0x40001b1c;
lmacMSDUAged = 0x40001b28;
//lmacSetTxFrame = 0x40001b4c;
components/esp_rom/esp32c3/ld/esp32c3.rom.eco7.ld
+1 -1
View File
@@ -8,7 +8,7 @@ esf_buf_alloc_dynamic = 0x400015c0;
esf_buf_recycle = 0x400015c4;
/*hal_mac_tx_set_ppdu = 0x400015d4;*/
ic_mac_deinit = 0x400015dc;
lmacDiscardMSDU = 0x400015f4;
/*lmacDiscardMSDU = 0x400015f4;*/
/*lmacSetTxFrame = 0x40001628;*/
lmacTxDone = 0x4000162c;
/*lmacTxFrame = 0x40001630;*/
components/esp_rom/esp32c5/ld/esp32c5.rom.pp.ld
+1 -1
View File
@@ -59,7 +59,7 @@ is_lmac_idle = 0x40000c84;
ic_get_he_rts_threshold_bytes = 0x40000c88;
lmacAdjustTimestamp = 0x40000c8c;
lmacDiscardAgedMSDU = 0x40000c90;
lmacDiscardMSDU = 0x40000c94;
/*lmacDiscardMSDU = 0x40000c94;*/
lmacEndFrameExchangeSequence = 0x40000c98;
lmacIsIdle = 0x40000c9c;
lmacIsLongFrame = 0x40000ca0;
components/esp_rom/esp32c61/ld/esp32c61.rom.eco4.ld
+1 -1
View File
@@ -36,7 +36,7 @@ pm_clear_wakeup_signal = 0x40000d78;
pm_mac_disable_tsf_tbtt_soc_wakeup = 0x40000d7c;
pm_mac_disable_tsf_tbtt_modem_wakeup = 0x40000d80;
pm_mac_enable_tsf_tbtt_soc_wakeup = 0x40000d84;
pm_mac_enable_tsf_tbtt_modem_wakeup = 0x40000d88;
//pm_mac_enable_tsf_tbtt_modem_wakeup = 0x40000d88;
//pm_mac_modem_params_rt_update = 0x40000d8c;
pm_coex_pwr_update = 0x40000d9c;
ppMapTxQueue = 0x40000ddc;
components/esp_rom/esp32c61/ld/esp32c61.rom.pp.ld
+1 -1
View File
@@ -57,7 +57,7 @@ is_lmac_idle = 0x40000bf4;
ic_get_he_rts_threshold_bytes = 0x40000bf8;
lmacAdjustTimestamp = 0x40000bfc;
lmacDiscardAgedMSDU = 0x40000c00;
lmacDiscardMSDU = 0x40000c04;
/*lmacDiscardMSDU = 0x40000c04;*/
lmacEndFrameExchangeSequence = 0x40000c08;
lmacIsIdle = 0x40000c0c;
lmacIsLongFrame = 0x40000c10;
components/esp_rom/esp32s3/ld/esp32s3.rom.ld
+1 -1
View File
@@ -953,7 +953,7 @@ lmacReachShortLimit = 0x40005394;
lmacRecycleMPDU = 0x400053a0;
lmacRxDone = 0x400053ac;
/*lmacSetTxFrame = 0x400053b8;*/
lmacTxDone = 0x400053c4;
/*lmacTxDone = 0x400053c4;*/
/*lmacTxFrame = 0x400053d0;*/
mac_tx_set_duration = 0x400053dc;
/* mac_tx_set_htsig = 0x400053e8;*/
components/esp_wifi/include/esp_wifi_he_types.h
+2 -1
View File
@@ -60,7 +60,8 @@ typedef struct {
uint32_t val_scale_cfg : 4; /**< value 0-8 */
uint32_t dump_ack_en : 1; /**< enable to dump 802.11 ACK frame, default disabled */
uint32_t reserved : 15; /**< reserved */
uint32_t lltf_bit_mode : 1; /**< LLTF bit width mode for I/Q components, 0 : 12-bit, 1 : 8-bit, default : 12-bit */
uint32_t reserved : 14; /**< reserved */
} wifi_csi_acquire_config_t;
#else
typedef struct {
components/esp_wifi/lib
+1 -1
Submodule components/esp_wifi/lib updated: 1955b2abcd...de83ca96fe
components/wpa_supplicant/esp_supplicant/src/esp_wifi_driver.h
+1 -1
View File
@@ -132,7 +132,7 @@ struct wpa_funcs {
bool (*wpa_ap_deinit)(void *data);
bool (*wpa_ap_join)(void **sm, u8 *bssid, u8 *wpa_ie, u8 wpa_ie_len, u8* rsnxe, u16 rsnxe_len, bool *pmf_enable, int subtype, uint8_t *pairwise_cipher, uint8_t *rsn_selection_ie);
bool (*wpa_ap_remove)(u8 *bssid);
uint8_t *(*wpa_ap_get_wpa_ie)(uint8_t *len);
uint8_t *(*wpa_ap_get_wpa_ie)(size_t *len);
bool (*wpa_ap_rx_eapol)(void *hapd_data, void *sm, u8 *data, size_t data_len);
void (*wpa_ap_get_peer_spp_msg)(void *sm, bool *spp_cap, bool *spp_req);
char *(*wpa_config_parse_string)(const char *value, size_t *len);
components/wpa_supplicant/esp_supplicant/src/esp_wpa_main.c
+1 -1
View File
@@ -147,7 +147,7 @@ bool wpa_attach(void)
return ret;
}
uint8_t *wpa_ap_get_wpa_ie(uint8_t *ie_len)
uint8_t *wpa_ap_get_wpa_ie(size_t *ie_len)
{
struct hostapd_data *hapd = (struct hostapd_data *)esp_wifi_get_hostap_private_internal();
examples/wifi/power_save/sdkconfig.ci.default
+1
View File
@@ -1 +1,2 @@
CONFIG_EXAMPLE_GET_AP_INFO_FROM_STDIN=y
CONFIG_ESP_SLEEP_CACHE_SAFE_ASSERTION=y