100 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jiang Jiang Jian	67b6ef3c1c	Merge branch 'fix/owe_prevent_double_free' into 'master' ... fix(wifi): Prevent double free in owe failure path Closes SEC-261 See merge request espressif/esp-idf!51401	2026-08-10 14:18:26 +08:00
Jiang Jiang Jian	a1ca70eb43	Merge branch 'fix/nan_avail_time_bitmap' into 'master' ... fix(nan): fix Wi-Fi Aware NDP handshake interop with iOS 17 series See merge request espressif/esp-idf!51544	2026-08-10 12:29:48 +08:00
Jiang Jiang Jian	8a928b98f2	Merge branch 'bugfix/fix_softap_return_home_channel_failed' into 'master' ... fix(scan): prioritize if1_conn check for home channel return logic Closes WIFI-7471 and WIFI-7428 See merge request espressif/esp-idf!50373	2026-08-06 16:32:24 +08:00
Jiang Jiang Jian	a063a8440f	Merge branch 'fix/fix_scan_and_connect_issue' into 'master' ... fix(wifi): fix wifi scan and wps connect issue Closes WIFIBUG-2051 See merge request espressif/esp-idf!51528	2026-08-06 10:56:41 +08:00
Jiang Jiang Jian	43b98a4fcc	Merge branch 'bugfix/fix_disconnect_failure_issue' into 'master' ... fix(wifi): fix disconnect failure issue Closes WIFI-7510 See merge request espressif/esp-idf!51176	2026-08-04 19:45:45 +08:00
Jiang Jiang Jian	bcce5b96c1	Merge branch 'fix/add_workaround_for_s31_beacon_timestamp_issue' into 'master' ... fix(wifi): add workaround for s31 beacon timestamp issue Closes WIFI-7526 and WIFIBUG-2039 See merge request espressif/esp-idf!51264	2026-08-04 14:48:08 +08:00
Jiang Jiang Jian	3808652972	Merge branch 'fix/fix_esp32s31_secureboot_fastwake' into 'master' ... fix(esp_system): support rom secure boot fast wake feature for esp32s31 Closes PM-832 See merge request espressif/esp-idf!51265	2026-07-31 14:12:25 +08:00
Jiang Jiang Jian	1ef3966018	Merge branch 'fix/regdma_work_timeout' into 'master' ... Workaround: add a write node to avoid the APB access timeout during REGDMA operations. See merge request espressif/esp-idf!51146	2026-07-30 17:46:49 +08:00
Jiang Jiang Jian	139d968de0	Merge branch 'bugfix/sco_pkt_type_err' into 'master' ... fix(bt/bluedroid): fixed incorrect eSCO packet type validation in secure connection mode Closes BTQABR2023-849 See merge request espressif/esp-idf!51251	2026-07-29 14:41:23 +08:00
Jiang Jiang Jian	2938ae7b60	Merge branch 'bugfix/fix_chip_cant_sleep_after_connect_failed' into 'master' ... fix(wifi): fix chip cant sleep when disconnecting at probe process Closes WIFI-7511 See merge request espressif/esp-idf!51012	2026-07-29 14:41:02 +08:00
Jiang Jiang Jian	b6120a46f4	Merge branch 'bugfix/fix_espnow_data_rate_error' into 'master' ... fix(wifi): fixed espnow data rate overridden by stale rate control Closes WIFI-7533 See merge request espressif/esp-idf!51175	2026-07-28 19:58:20 +08:00
Jiang Jiang Jian	8e7e031230	Merge branch 'feat/support_active_tickless_idle' into 'master' ... feat(esp_pm): support freertos tickless IDLE with auto lightsleep disabled Closes PM-799 See merge request espressif/esp-idf!49817	2026-07-28 17:04:50 +08:00
Jiang Jiang Jian	5cdb93dcc4	Merge branch 'bugfix/fix_addba_dialog_token_zero_and_add_ds_parameter' into 'master' ... fix(wifi): fix addba request dialog token zero and add ds parameter IE on 5g band See merge request espressif/esp-idf!51028	2026-07-28 16:45:12 +08:00
Jiang Jiang Jian	845820658c	Merge branch 'fix/bind_lp_periph_pd_with_tsens_power' into 'master' ... fix(esp_driver_tsens): bind lp_periph domain sleep pd with tsens power See merge request espressif/esp-idf!51074	2026-07-27 10:33:28 +08:00
Jiang Jiang Jian	102122904a	Merge branch 'bugfix/fix_assignment_error_in_esptouch_v2' into 'master' ... fix(wifi): fixed the assignment error in esptouch v2 See merge request espressif/esp-idf!51094	2026-07-23 21:06:47 +08:00
Jiang Jiang Jian	ade59336b6	Merge branch 'bugfix/fix_crash_issue_on_esptouch_v2' into 'master' ... fix(wifi): added validation for password and reserved data length in ESPTouch v2 Closes WIFI-7448, WIFI-7484, WIFI-7482, and WIFI-7444 See merge request espressif/esp-idf!50110	2026-07-22 16:27:15 +08:00
Jiang Jiang Jian	e41650a966	Merge branch 'bugfix/remove_phy_lib_librfate' into 'master' ... fix(phy): removed all librfate logic from cmake Closes IDFCI-13345 See merge request espressif/esp-idf!50940	2026-07-21 10:49:48 +08:00
Jiang Jiang Jian	3b11b2d810	Merge branch 'bugfix/nan_mem_corruption' into 'master' ... Fix(NAN): fix Memory Corruption due to BIP encryption Closes WIFIBUG-2035, WIFIBUG-1946, and WIFIBUG-1947 See merge request espressif/esp-idf!50469	2026-07-17 20:39:48 +08:00
Jiang Jiang Jian	a7c44ab4a0	Merge branch 'bugfix/add_en_rst_in_pvt_func_for_p4' into 'master' ... fix(pvt): add en reset in pvt func for p4 on master Closes IDFCI-12684, IDFCI-12696, IDFCI-12692, IDFCI-12694, IDFCI-12698, IDFCI-12724, IDFCI-12799, IDFCI-13041, IDFCI-13044, IDFCI-13043, IDFCI-12364, IDFCI-13073, IDFCI-7257, IDFCI-7261, IDFCI-12470, IDFCI-12471, IDFCI-13088, IDFCI-13042, IDFCI-7258, IDFCI-12693, IDFCI-12697, IDFCI-12695, IDFCI-11510, IDFCI-12465, IDFCI-12582, IDFCI-12474, IDFCI-12473, IDFCI-12463, IDFCI-7248, IDFCI-12469, IDFCI-12583, IDFCI-13098, IDFCI-13100, IDFCI-13099, IDFCI-13097, IDFCI-12363, and IDFCI-13217 See merge request espressif/esp-idf!50466	2026-07-17 16:20:39 +08:00
Jiang Jiang Jian	d75007fdfa	Merge branch 'fix/update_phylib_to_fix_esp32c61_bod_rts' into 'master' ... fix(phy): fix esp32c61 bod rst Closes WIFIBUG-1755 See merge request espressif/esp-idf!49374	2026-07-17 15:53:01 +08:00
Jiang Jiang Jian	23b3c3d4ca	Merge branch 'bugfix/supplicant_crypto_code_correction' into 'master' ... fix(wpa_supplicant): Correct some functions in crypto porting layer See merge request espressif/esp-idf!50236	2026-07-17 14:12:59 +08:00
Jiang Jiang Jian	fa194a7cc2	Merge branch 'fix/move_cache_lock_workaround_out_of_ipc_stall' into 'master' ... fix(esp_hw_support): disable esp32 livelock workaround before stall another core Closes PM-814 See merge request espressif/esp-idf!50769	2026-07-17 11:26:06 +08:00
Jiang Jiang Jian	f84166fcdb	Merge branch 'bugfix/fix_coex_status_get_issue' into 'master' ... fix(coex): fix coex status get issue Closes WIFIBUG-2018 See merge request espressif/esp-idf!50739	2026-07-17 10:43:57 +08:00
Jiang Jiang Jian	0112096d1b	Merge branch 'fix/fix_coex_iso_cache_error' into 'master' ... fix(coex): Fixed BLE iso coex cache error See merge request espressif/esp-idf!50652	2026-07-16 20:47:31 +08:00
Jiang Jiang Jian	0cd01c19bb	Merge branch 'feat/configure_related_154_regs_when_enable_coex' into 'master' ... fix(coex): move 15.4 register configuration to 15.4 init Closes WIFI-7364 See merge request espressif/esp-idf!48956	2026-07-16 17:18:59 +08:00
Jiang Jiang Jian	eabb439dc0	Merge branch 'fix/esp32s31-static-cpu-retention' into 'master' ... esp32s31: fix build failure when CONFIG_PM_CPU_RETENTION_STATIC is enabled Closes IDFGH-17896 See merge request espressif/esp-idf!50458	2026-07-16 11:38:44 +08:00
Jiang Jiang Jian	bf4218a71f	Merge branch 'bugfix/nan_null_tx' into 'master' ... fix(nan): Transmit NULL packet correctly to avoid NDP termination Closes WIFIBUG-1973 and WIFIBUG-2025 See merge request espressif/esp-idf!50302	2026-07-14 12:27:35 +08:00
Jiang Jiang Jian	683088e89f	Merge branch 'bugfix/dpp_pmkid' into 'master' ... fix(wpa_supplicant): Fix issues related to pmkid mismatch and eloop for dpp Closes WIFIBUG-762, WIFIBUG-1873, WIFIBUG-1941, WIFIBUG-1992, WIFIBUG-1852, WIFIBUG-1872, WIFIBUG-1950, WIFIBUG-1940, WIFIBUG-1810, WIFIBUG-1929, WIFIBUG-1925, and WIFIBUG-1864 See merge request espressif/esp-idf!49043	2026-07-10 12:30:14 +08:00
Jiang Jiang Jian	74005f29cf	Merge branch 'fix/support_two_MAC_only_esp32s31' into 'master' ... fix(esp32s31): restrict UNIVERSAL_MAC_ADDRESSES to Two See merge request espressif/esp-idf!50389	2026-07-09 17:40:40 +08:00
Jiang Jiang Jian	12dd02396b	Merge branch 'bugfix/change_pvt_timer_target_param' into 'master' ... feat(pvt): change pvt timer target & limit on master See merge request espressif/esp-idf!50472	2026-07-09 16:53:01 +08:00
Jiang Jiang Jian	a7883b90c5	Merge branch 'fix/blacklist_flag_correction' into 'master' ... Correct blacklist flag Closes WIFIBUG-1959 See merge request espressif/esp-idf!49830	2026-07-09 14:44:42 +08:00
Jiang Jiang Jian	1605930498	Merge branch 'bugfix/fix_offchan_rx_fail_when_spiram_enabled' into 'master' ... fix(wifi): fixed the offchan tx fail when SPIRAM_TRY_ALLOCATE_WIFI_LWIP enabled Closes WIFI-7402 See merge request espressif/esp-idf!50194	2026-07-07 19:34:43 +08:00
Jiang Jiang Jian	309b3e82ec	Merge branch 'fix/ble_mesh_disable_adv_pkt_discard_log' into 'master' ... fix(ble_mesh): Disable warning logging when advertising packets are discarded Closes BLERP-2945 See merge request espressif/esp-idf!50146	2026-07-06 15:13:06 +08:00
Jiang Jiang Jian	9126adadb9	Merge branch 'fix/ble_mesh_fixed_issues' into 'master' ... Resolve NVIDIA-reported BLE mesh stack issues Closes SEC-1116, SEC-1069, SEC-761, SEC-1068, SEC-1130, and SEC-1185 See merge request espressif/esp-idf!50176	2026-07-06 15:09:30 +08:00
Jiang Jiang Jian	dc6ff3a91e	Merge branch 'feat/update_pmu_pau_reg_description' into 'master' ... feat(soc): update esp32c61 PMU & PAU reg header descriptions See merge request espressif/esp-idf!50240	2026-07-06 10:35:29 +08:00
Jiang Jiang Jian	c7f22a4508	Merge branch 'fix/fix_sleep_cache_writeback_logic' into 'master' ... fix(esp_hw_support): fix esp32s31 sleeping cache writeback logic Closes PM-807 See merge request espressif/esp-idf!50346	2026-07-03 22:29:21 +08:00
Jiang Jiang Jian	fa86d80f71	Merge branch 'feat/nan_gtk_support' into 'master' ... feat(wifi_aware): advertise group data/mgmt protection (GTK/IGTK/BIGTK) and iOS compliance fixes See merge request espressif/esp-idf!49800	2026-07-02 18:32:56 +08:00
Jiang Jiang Jian	9d263e3725	Merge branch 'feat/nd6_static_neighbor_entries' into 'master' ... feat(lwip): Add IPv6 static neighbor cache entry support See merge request espressif/esp-idf!49961	2026-06-30 23:34:17 +08:00
Jiang Jiang Jian	9bd49630fc	Merge branch 'bugfix/clear_ifx_tx_queue' into 'master' ... bugfix(wifi): Clear Sta TX queue to prevent key 2 send failure Closes WIFIBUG-745 and WIFIBUG-1597 See merge request espressif/esp-idf!40211	2026-06-30 19:47:15 +08:00
Jiang Jiang Jian	936083c626	Merge branch 'feat/pasn_verification' into 'master' ... feat(nan): Add changes for nan pasn verification See merge request espressif/esp-idf!49694	2026-06-30 16:58:13 +08:00
Jiang Jiang Jian	8b8a2115e4	Merge branch 'bugfix/fix_tx_issues_introduced_by_keep_alive_opt' into 'master' ... bugfix/fix tx issues introduced by keep alive opt Closes WIFIBUG-1991, WIFIBUG-1999, and WIFIBUG-1994 See merge request espressif/esp-idf!50108	2026-06-30 15:16:07 +08:00
Jiang Jiang Jian	ae860abd4c	Merge branch 'bugfix/ai_review_btu_common' into 'master' ... fix: Fix the critical issues of btu and bt_common from AI review report See merge request espressif/esp-idf!49574	2026-06-29 12:00:22 +08:00
Jiang Jiang Jian	af7e18f9d0	Merge branch 'bugfix/ai_review_a2dp' into 'master' ... fix(bt): Fix the critical issues related to A2DP from AI review report See merge request espressif/esp-idf!49355	2026-06-29 11:58:39 +08:00
Jiang Jiang Jian	d9b3b6984a	Merge branch 'bugfix/fix_smartconfig_stop_assert_issue' into 'master' ... fix(wifi): added start check when calling smartconfig stop Closes WIFI-7432 See merge request espressif/esp-idf!49993	2026-06-26 14:04:33 +08:00
Jiang Jiang Jian	87a6c90160	Merge branch 'bugfix/pub_ndp_setup_timeout' into 'master' ... fix(nan): Cluster merging and NIK NVS persistence, including pairing and NDP fixes Closes WIFIBUG-1932, WIFIBUG-1931, WIFIBUG-1927, WIFIBUG-1942, WIFIBUG-1948, WIFIBUG-1955, WIFIBUG-1986, and WIFIBUG-1975 See merge request espressif/esp-idf!49185	2026-06-24 20:57:22 +08:00
Jiang Jiang Jian	05ea6b2900	Merge branch 'bugfix/fix_some_external_coex_issues' into 'master' ... Bugfix/fix some external coex issues See merge request espressif/esp-idf!49259	2026-06-24 17:45:52 +08:00
Jiang Jiang Jian	16da34ad67	Merge branch 'feat/ftm_esp32s31_calib_values' into 'master' ... feat(ftm): Update ftm calibration values esp32s31 See merge request espressif/esp-idf!49221	2026-06-24 16:28:29 +08:00
Jiang Jiang Jian	1c21efd181	Merge branch 'feat/update_esp32s31_phylib' into 'master' ... feat(phy): update esp32s31 phy lib See merge request espressif/esp-idf!49564	2026-06-23 17:09:28 +08:00
Jiang Jiang Jian	dc2fcf2c6c	Merge branch 'bugfix/defering_post_disconnect_event_after_disassociation_tx_callback' into 'master' ... fix(wifi): post disconnect event after disassociation tx callback Closes WIFIBUG-1858 See merge request espressif/esp-idf!48796	2026-06-23 14:17:37 +08:00
Jiang Jiang Jian	8b2a97b6be	Merge branch 'bugfix/fix_cache_access_error_in_wifi_interrupt' into 'master' ... fix(wifi): fix cache access error in wifi interrupt with psram enabled Closes WIFIBUG-1964 and WIFIBUG-1970 See merge request espressif/esp-idf!49645	2026-06-18 18:07:17 +08:00
Jiang Jiang Jian	5a1adbfb1c	Merge branch 'change/ble_update_lib_20260612' into 'master' ... change(ble): [AUTO_MR] 20260612 - Update ESP BLE Controller Lib Closes BLERP-2888 See merge request espressif/esp-idf!49605	2026-06-18 17:20:25 +08:00
Jiang Jiang Jian	a602e67b0b	Merge branch 'feat/update_s31_wifi_lower_power' into 'master' ... feat: update_s31_wifi_low_power See merge request espressif/esp-idf!49753	2026-06-17 20:06:56 +08:00
Jiang Jiang Jian	41a7095015	Merge branch 'feat/support_usb_wakeup_from_light_sleep' into 'master' ... feat: support usb wakeup from light sleep Closes IDF-7212 See merge request espressif/esp-idf!48988	2026-06-17 19:50:11 +08:00
Jiang Jiang Jian	4585adaa1a	Merge branch 'chip/add_wifi_support_for_esp32s31_ftm' into 'master' ... feat/add wifi support for esp32s31 ftm See merge request espressif/esp-idf!48457	2026-06-12 13:52:24 +08:00
Jiang Jiang Jian	9841a9664a	Merge branch 'bugfix/fix_task_switch_issue_of_wifi_task' into 'master' ... fix(wifi): fix scheduling issue when tasks have the same priority as the Wi-Fi task See merge request espressif/esp-idf!49154	2026-06-10 19:33:13 +08:00
Jiang Jiang Jian	f6eceb316a	Merge branch 'feat/support_esp32s31_dfu' into 'master' ... Feat/support esp32s31 dfu See merge request espressif/esp-idf!49329	2026-06-10 15:48:00 +08:00
Jiang Jiang Jian	f17a63bae9	Merge branch 'feat/optimizations_related_to_keep_alive' into 'master' ... feat(wifi): optimizations ralated to keep alive Closes WIFIBUG-1553 See merge request espressif/esp-idf!46641	2026-06-09 20:47:34 +08:00
Jiang Jiang Jian	853a2cfd3a	Merge branch 'chip/support_wifi_low_power_for_s31_rebase_master' into 'master' ... Chip/support wifi low power for s31 rebase master Closes IDF-14579 and IDF-14582 See merge request espressif/esp-idf!48532	2026-06-09 15:16:53 +08:00
Jiang Jiang Jian	6fc0a63c4e	Merge branch 'bugfix/idfci-11637' into 'master' ... support emac sleep retention runtime attach and detach Closes IDFCI-11637 and IDFCI-11638 See merge request espressif/esp-idf!49331	2026-06-08 12:28:10 +08:00
Jiang Jiang Jian	c73c20a61f	Merge branch 'bugfix/update_supplicant_nist_api' into 'master' ... fix(wpa_supplicant): migrate aes_wrap to PSA NIST-KW API Closes IDFGH-17750 See merge request espressif/esp-idf!49091	2026-06-05 14:41:01 +08:00
Jiang Jiang Jian	7ed4c8c1c3	Merge branch 'fix/phy_cal' into 'master' ... fix(phy): fix wifi tx failed when sta wake from deepsleep See merge request espressif/esp-idf!49285	2026-06-04 22:53:28 +08:00
Jiang Jiang Jian	2fe6d29478	Merge branch 'bugfix/add_monitor_en_rst_in_pvt_func' into 'master' ... feat(pvt): fix monitor en rst error in pvt func on master See merge request espressif/esp-idf!49027	2026-06-04 20:15:48 +08:00
Jiang Jiang Jian	ed31b372b7	Merge branch 'feat/support_esp32h21_coex' into 'master' ... feat(coex): support esp32h21 coexist Closes IDF-11658, IDF-11659, and IDF-11660 See merge request espressif/esp-idf!48948	2026-06-04 11:51:24 +08:00
Jiang Jiang Jian	5fc361d5d0	Merge branch 'bugfix/fix_some_rom_func_ld_issue' into 'master' ... fix(wifi): fix som rom func ld issue See merge request espressif/esp-idf!49004	2026-06-01 11:12:04 +08:00
Jiang Jiang Jian	3caea56d78	Merge branch 'fix/fix_put_phy_init_bin_into_partiiton_when_embed' into 'master' ... fix(phy): fix still put multiple phy init date bin into flash when... See merge request espressif/esp-idf!48847	2026-05-26 10:22:27 +08:00
Jiang Jiang Jian	a14770e597	Merge branch 'fix/add_owe_check_pmf_disable' into 'master' ... fix(wifi) : Add Mode/threshold checks in esp_wifi_disable_pmf_config() Closes WIFIBUG-1876 See merge request espressif/esp-idf!48713	2026-05-26 10:20:56 +08:00
Jiang Jiang Jian	b6a2af2fe1	Merge branch 'fix/mbedtls-threading-impl-kconfig' into 'master' ... fix(mbedtls): make threading implementation exclusive See merge request espressif/esp-idf!48846	2026-05-25 18:08:30 +08:00
Jiang Jiang Jian	0b0c85cb3b	Merge branch 'feat/dpp_multi_config' into 'master' ... Feature: Add dpp multiconfig support Closes WIFIBUG-1873, WIFIBUG-1852, WIFIBUG-762, and WIFIBUG-1810 See merge request espressif/esp-idf!48191	2026-05-25 15:40:54 +08:00
Jiang Jiang Jian	6544496a22	Merge branch 'feature/random_mac' into 'master' ... feat(esp_wifi): Add support for privacy enhancement techniques Closes DOC-14631 See merge request espressif/esp-idf!34263	2026-05-25 12:15:23 +08:00
Jiang Jiang Jian	199c586041	Merge branch 'fix/isp_iram_safe_typo' into 'master' ... fix(isp): fix typo in CONFIG_ISP_ISR_IRAM_SAFE macro reference See merge request espressif/esp-idf!48815	2026-05-22 17:23:41 +08:00
Jiang Jiang Jian	1e28f30c2a	Merge branch 'feat/nan_pairing_pasn_auth' into 'master' ... feat(wifi): Support NAN Pairing with PASN as par Specs v4.0 Closes WIFI-7102 See merge request espressif/esp-idf!47145	2026-05-22 16:29:28 +08:00
Jiang Jiang Jian	2dc66242b7	Merge branch 'bugfix/supp_pcm_over_i2s' into 'master' ... fix(bt/controller): fixed several controller issues Closes BTQABR2023-692, BTQABR2023-722, BTQABR2023-675, and BTQABR2023-688 See merge request espressif/esp-idf!48684	2026-05-22 14:30:49 +08:00
Jiang Jiang Jian	197d784600	Merge branch 'feat/a2dp_support_other_codec' into 'master' ... feat(bt): A2DP source supports AAC codec See merge request espressif/esp-idf!48631	2026-05-22 14:27:33 +08:00
Jiang Jiang Jian	90ec41a9f7	Merge branch 'feat/support_rom_psa_mbedtls' into 'master' ... feat(mbedtls): enable ESP32-C2(Rev2.0) ROM mbedTLS crypto for PSA Closes IDF-15012 See merge request espressif/esp-idf!48211	2026-05-22 11:24:42 +08:00
Jiang Jiang Jian	fff1564266	Merge branch 'fix/for_cache_after_p4_wb_loss_issue' into 'master' ... fix(esp_rom): avoid critical issue in writeback See merge request espressif/esp-idf!48498	2026-05-21 22:10:00 +08:00
Jiang Jiang Jian	0f2674f616	Merge branch 'bugfix/fix_ble_coded_phy_rx_bug' into 'master' ... fix(coex): fix ble coded phy rx issue when aborted by coex Closes BT-4291 and BT-4251 See merge request espressif/esp-idf!46962	2026-05-20 19:02:39 +08:00
Jiang Jiang Jian	8609249317	Merge branch 'fix/remove_intwdt_config_critical_for_chips_except_esp32' into 'master' ... fix(esp_system): remove intwdt config critical area for chips except esp32 See merge request espressif/esp-idf!47097	2026-05-20 17:14:13 +08:00
Jiang Jiang Jian	426295f132	Merge branch 'bugfix/allow_m1_for_pmk_cache' into 'master' ... fix(esp_wifi): Allow M1 in pmk caching case Closes WIFIBUG-1884 See merge request espressif/esp-idf!48403	2026-05-20 15:52:58 +08:00
Jiang Jiang Jian	e02f5a9710	Merge branch 'feat/support_twt_for_esp32s31' into 'master' ... feat(wifi): update itwt example See merge request espressif/esp-idf!48483	2026-05-20 15:00:19 +08:00
Jiang Jiang Jian	6dfaa77159	Merge branch 'feat/nan_encrypted_data_path' into 'master' ... feat(wifi): support encrypted data path in WiFi Aware (NAN) See merge request espressif/esp-idf!45270	2026-05-20 14:25:17 +08:00
Jiang Jiang Jian	dca2e6c10a	Merge branch 'feat/support_esp32h4_coex' into 'master' ... feat: support esp32h4 coex Closes IDF-12251 and TZ-2483 See merge request espressif/esp-idf!47604	2026-05-20 11:20:40 +08:00
Jiang Jiang Jian	f091260321	Merge branch 'bugfix/update_wifi_scan_threshold_doc' into 'master' ... fix(wifi): update auth mode threshold doc Closes FCS-1689 See merge request espressif/esp-idf!37685	2026-05-19 11:29:18 +08:00
Jiang Jiang Jian	ef338c61b4	Merge branch 'feat/support_weak_func_wifi_assert' into 'master' ... fix(wifi): support weak func for wifi lmac assert Closes WIFIBUG-1715 See merge request espressif/esp-idf!45496	2026-05-15 20:46:48 +08:00
Jiang Jiang Jian	900a72f7b6	Merge branch 'bugfix/roaming_app_track_data' into 'master' ... fix(roaming): prevent timeout payload double-free on deinit Closes WIFIBUG-1880 See merge request espressif/esp-idf!48361	2026-05-15 19:43:12 +08:00
Jiang Jiang Jian	1adf5e6613	Merge branch 'feat/support_esp3261_cert_test_example' into 'master' ... feat(phy): support esp32c61 example cert test and antenna Closes WIFI-6696 and IDF-9859 See merge request espressif/esp-idf!47122	2026-05-15 16:48:24 +08:00
Jiang Jiang Jian	492160df43	Merge branch 'fix/disable_i2c_master_clk_while_hw_hop_processing' into 'master' ... fix(esp_phy): check hw freq hop done before disabling common clock Closes WIFIBUG-1738 See merge request espressif/esp-idf!46388	2026-05-15 15:44:57 +08:00
Jiang Jiang Jian	8f57c5232d	Merge branch 'feat/support_persistent_esp_rsa_ds_keys' into 'master' ... Support persistent ESP RSA DS keys Closes IDF-15427 See merge request espressif/esp-idf!46358	2026-05-15 15:42:54 +08:00
Jiang Jiang Jian	a99398a52e	Merge branch 'ci/add_static_tx_buffer_case' into 'master' ... Add wifi connect case when static tx buffer enable See merge request espressif/esp-idf!48494	2026-05-15 10:08:50 +08:00
Jiang Jiang Jian	0f96f27d35	Merge branch 'feat/add_ci_ut_test_for_auto_mode_connect_passive_channel_hidden_ap' into 'master' ... feat(ci): add ci test for auto mode connect passive chnnel hidden ap Closes WIFI-7298 See merge request espressif/esp-idf!47140	2026-05-14 20:34:16 +08:00
Jiang Jiang Jian	0ccf6a6a7b	Merge branch 'bugfix/fix_some_s31_coex_iso_issues' into 'master' ... fix(coex): fix some s31 coex iso issues See merge request espressif/esp-idf!48508	2026-05-14 20:32:04 +08:00
Jiang Jiang Jian	305767451e	Merge branch 'bugfix/hfp_co_build_err' into 'master' ... fix(bt/bluedroid): fixed building errors in HFP datapath See merge request espressif/esp-idf!48507	2026-05-14 14:28:49 +08:00
Jiang Jiang Jian	d65a38965c	Merge branch 'fix/nan_improvements' into 'master' ... Multiple NAN improvements in Service Discovery Closes WIFI-5625 See merge request espressif/esp-idf!46455	2026-05-13 19:51:55 +08:00
Jiang Jiang Jian	8bd8d358c8	Merge branch 'bugfix/fix_hidden_ap_rssi_does_not_update_issue' into 'master' ... fix(wifi): fix hidden ap rssi update and owe beacon timeout issue Closes FCS-1851, WIFI-7283, and WIFIBUG-1817 See merge request espressif/esp-idf!46017	2026-05-13 14:27:04 +08:00
Jiang Jiang Jian	f1d85b531f	Merge branch 'fix/fix_dfs_channel_check_wrong' into 'master' ... fix(wifi): fix dfs channel check wrong Closes WIFIBUG-1887 See merge request espressif/esp-idf!48435	2026-05-13 10:49:15 +08:00
Jiang Jiang Jian	fc27941619	Merge branch 'bugfix/s31_rng_bypass' into 'master' ... fix(esp_wifi): Add support to bypass rng during bringup Closes WIFIBUG-1878 and WIFIBUG-1879 See merge request espressif/esp-idf!48381	2026-05-12 17:33:06 +08:00
Jiang Jiang Jian	cd80cae78c	Merge branch 'fix/aeg_3009' into 'master' ... fix(wifi): IRAM for regdma path used in modem pd light sleep & remove all rc when STA actively call esp_wifi_disconnect() Closes AEG-3009 and WIFI-7357 See merge request espressif/esp-idf!47624	2026-05-09 19:17:47 +08:00
Jiang Jiang Jian	8476c9cbad	Merge branch 'fix/nan_teardown_race_condition' into 'master' ... fix(wifi): stop NAN timers from re-arming after esp_wifi_stop See merge request espressif/esp-idf!46616	2026-05-09 14:05:35 +08:00
Jiang Jiang Jian	6e9691e352	Merge branch 'bugfix/concurrency_hostapd_sae_queue' into 'master' ... fix(wifi): Fix concurrency issues for hostapd_sae_queue for softap Closes WIFIBUG-1048 See merge request espressif/esp-idf!37032	2026-05-08 18:26:35 +08:00
Jiang Jiang Jian	166054ab3c	Merge branch 'feat/support_lp_debug_probe' into 'master' ... feat(esp_hw_support): support esp32p4 VDD_BAT sleep mode main power control by LP_Probe Closes IDF-15413 See merge request espressif/esp-idf!46509	2026-05-08 17:23:15 +08:00
Jiang Jiang Jian	b3c9694b82	Merge branch 'bugfix/matching_filter_overwrite' into 'master' ... fix(nan): Prevent overwriting of matching filter by SSI Closes IDFGH-17234 See merge request espressif/esp-idf!46227	2026-05-08 15:38:45 +08:00