Merge branch 'bugfix/wapi_gtk_gcmp_frag_pn' into 'master'

esp_wifi: fix wapi gtk id compability issue and adapt tx frag pn sequently. Closes WIFI-3799 and WIFI-5009 See merge request espressif/esp-idf!20986
espressif · Nov 9, 2022 · 5f0cb56 · 5f0cb56
2 parents d2d0294 + 67c557f
commit 5f0cb56
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/components/esp_rom/esp32c3/ld/esp32c3.rom.ld b/components/esp_rom/esp32c3/ld/esp32c3.rom.ld
@@ -1732,7 +1732,7 @@ ieee80211_recycle_cache_eb = 0x4000188c;
 ieee80211_search_node = 0x40001890;
 roundup2 = 0x40001894;
 ieee80211_crypto_encap = 0x40001898;
-ieee80211_crypto_decap = 0x4000189c;
+/* ieee80211_crypto_decap = 0x4000189c; */
 /* ieee80211_decap = 0x400018a0; */
 ieee80211_set_tx_pti = 0x400018a4;
 wifi_is_started = 0x400018a8;

diff --git a/components/esp_rom/esp32s3/ld/esp32s3.rom.ld b/components/esp_rom/esp32s3/ld/esp32s3.rom.ld
@@ -2043,7 +2043,7 @@ ieee80211_recycle_cache_eb = 0x40005afc;
 ieee80211_search_node = 0x40005b08;
 roundup2 = 0x40005b14;
 ieee80211_crypto_encap = 0x40005b20;
-ieee80211_crypto_decap = 0x40005b2c;
+/* ieee80211_crypto_decap = 0x40005b2c; */
 /* ieee80211_decap = 0x40005b38; */
 ieee80211_set_tx_pti = 0x40005b44;
 wifi_is_started = 0x40005b50;

diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib