Merge branch 'bugfix/fix_rx_error_for_softap_add_espnow' into 'master'

fix(wifi): fix the RX error when softAP/station and ESP-NOW both encrypted Closes WIFI-4116 See merge request espressif/esp-idf!24996
espressif · Jul 26, 2023 · ad99c16 · ad99c16
2 parents aa6a8b7 + a33a78f
commit ad99c16
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/components/esp_rom/esp32c2/ld/esp32c2.rom.ld b/components/esp_rom/esp32c2/ld/esp32c2.rom.ld
@@ -1720,7 +1720,7 @@ esp_wifi_internal_get_rts = 0x40001e04;
 /*esf_buf_setup = 0x40001e0c;*/
 hal_agreement_add_rx_ba = 0x40001e10;
 hal_agreement_del_rx_ba = 0x40001e14;
-hal_crypto_set_key_entry = 0x40001e18;
+/*hal_crypto_set_key_entry = 0x40001e18;*/
 hal_crypto_get_key_entry = 0x40001e1c;
 hal_crypto_clr_key_entry = 0x40001e20;
 config_get_wifi_task_stack_size = 0x40001e24;

diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib
+ −		esp32/libcore.a
+ −		esp32/libespnow.a
+ −		esp32/libmesh.a
+ −		esp32/libnet80211.a
+ −		esp32/libpp.a
+ −		esp32/libsmartconfig.a
+ −		esp32/libwapi.a
+ −		esp32c2/libcore.a
+ −		esp32c2/libespnow.a
+ −		esp32c2/libnet80211.a
+ −		esp32c2/libpp.a
+ −		esp32c2/libsmartconfig.a
+ −		esp32c3/libcore.a
+ −		esp32c3/libespnow.a
+ −		esp32c3/libmesh.a
+ −		esp32c3/libnet80211.a
+ −		esp32c3/libpp.a
+ −		esp32c3/libsmartconfig.a
+ −		esp32c3/libwapi.a
+ −		esp32c6/libcore.a
+ −		esp32c6/libespnow.a
+ −		esp32c6/libmesh.a
+ −		esp32c6/libnet80211.a
+ −		esp32c6/libpp.a
+ −		esp32c6/libsmartconfig.a
+ −		esp32c6/libwapi.a
+ −		esp32s2/libcore.a
+ −		esp32s2/libespnow.a
+ −		esp32s2/libmesh.a
+ −		esp32s2/libnet80211.a
+ −		esp32s2/libpp.a
+ −		esp32s2/libsmartconfig.a
+ −		esp32s2/libwapi.a
+ −		esp32s3/libcore.a
+ −		esp32s3/libespnow.a
+ −		esp32s3/libmesh.a
+ −		esp32s3/libnet80211.a
+ −		esp32s3/libpp.a
+ −		esp32s3/libsmartconfig.a
+ −		esp32s3/libwapi.a