From fedfac470a992d2ee221e8a01eb405bc3d89e15d Mon Sep 17 00:00:00 2001
From: muhaidong <muhaidong@espressif.com>
Date: Mon, 18 Mar 2024 11:44:53 +0800
Subject: [PATCH] fix(wifi): fix multicast address qos frames issue

---
 components/esp_rom/esp32c2/ld/esp32c2.rom.ld                    | 2 +-
 components/esp_rom/esp32c3/ld/esp32c3.rom.ld                    | 2 +-
 .../esp_rom/esp32c5/mp/esp32c5/ld/esp32c5.rom.net80211.ld       | 2 +-
 components/esp_rom/esp32c6/ld/esp32c6.rom.net80211.ld           | 2 +-
 components/esp_rom/esp32c61/ld/esp32c61.rom.net80211.ld         | 2 +-
 components/esp_rom/esp32s3/ld/esp32s3.rom.ld                    | 2 +-
 components/esp_wifi/lib                                         | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/components/esp_rom/esp32c2/ld/esp32c2.rom.ld b/components/esp_rom/esp32c2/ld/esp32c2.rom.ld
index 5dcf695de9..a9402aaa28 100644
--- a/components/esp_rom/esp32c2/ld/esp32c2.rom.ld
+++ b/components/esp_rom/esp32c2/ld/esp32c2.rom.ld
@@ -1770,7 +1770,7 @@ ic_ebuf_recycle_rx = 0x40001fa0;
 ic_ebuf_recycle_tx = 0x40001fa4;
 ic_reset_rx_ba = 0x40001fa8;
 ieee80211_align_eb = 0x40001fac;
-ieee80211_ampdu_reorder = 0x40001fb0;
+/*ieee80211_ampdu_reorder = 0x40001fb0;*/
 ieee80211_ampdu_start_age_timer = 0x40001fb4;
 /*ieee80211_encap_esfbuf = 0x40001fb8;*/
 ieee80211_is_tx_allowed = 0x40001fbc;
diff --git a/components/esp_rom/esp32c3/ld/esp32c3.rom.ld b/components/esp_rom/esp32c3/ld/esp32c3.rom.ld
index 0d86b315ad..8a82152774 100644
--- a/components/esp_rom/esp32c3/ld/esp32c3.rom.ld
+++ b/components/esp_rom/esp32c3/ld/esp32c3.rom.ld
@@ -1717,7 +1717,7 @@ ic_ebuf_recycle_rx = 0x40001844;
 ic_ebuf_recycle_tx = 0x40001848;
 ic_reset_rx_ba = 0x4000184c;
 ieee80211_align_eb = 0x40001850;
-ieee80211_ampdu_reorder = 0x40001854;
+/*ieee80211_ampdu_reorder = 0x40001854;*/
 ieee80211_ampdu_start_age_timer = 0x40001858;
 /*ieee80211_encap_esfbuf = 0x4000185c;*/
 ieee80211_is_tx_allowed = 0x40001860;
diff --git a/components/esp_rom/esp32c5/mp/esp32c5/ld/esp32c5.rom.net80211.ld b/components/esp_rom/esp32c5/mp/esp32c5/ld/esp32c5.rom.net80211.ld
index ea2f05dad6..0e27c68d55 100644
--- a/components/esp_rom/esp32c5/mp/esp32c5/ld/esp32c5.rom.net80211.ld
+++ b/components/esp_rom/esp32c5/mp/esp32c5/ld/esp32c5.rom.net80211.ld
@@ -31,7 +31,7 @@ ic_ebuf_recycle_rx = 0x40000b70;
 ic_ebuf_recycle_tx = 0x40000b74;
 ic_reset_rx_ba = 0x40000b78;
 ieee80211_align_eb = 0x40000b7c;
-ieee80211_ampdu_reorder = 0x40000b80;
+/*ieee80211_ampdu_reorder = 0x40000b80;*/
 ieee80211_ampdu_start_age_timer = 0x40000b84;
 ieee80211_encap_esfbuf = 0x40000b88;
 ieee80211_is_tx_allowed = 0x40000b8c;
diff --git a/components/esp_rom/esp32c6/ld/esp32c6.rom.net80211.ld b/components/esp_rom/esp32c6/ld/esp32c6.rom.net80211.ld
index 6156a8bc83..7a73b4d5a7 100644
--- a/components/esp_rom/esp32c6/ld/esp32c6.rom.net80211.ld
+++ b/components/esp_rom/esp32c6/ld/esp32c6.rom.net80211.ld
@@ -31,7 +31,7 @@ ic_ebuf_recycle_rx = 0x40000b70;
 ic_ebuf_recycle_tx = 0x40000b74;
 ic_reset_rx_ba = 0x40000b78;
 ieee80211_align_eb = 0x40000b7c;
-ieee80211_ampdu_reorder = 0x40000b80;
+/*ieee80211_ampdu_reorder = 0x40000b80;*/
 ieee80211_ampdu_start_age_timer = 0x40000b84;
 /*ieee80211_encap_esfbuf = 0x40000b88;*/
 ieee80211_is_tx_allowed = 0x40000b8c;
diff --git a/components/esp_rom/esp32c61/ld/esp32c61.rom.net80211.ld b/components/esp_rom/esp32c61/ld/esp32c61.rom.net80211.ld
index 800f1f3c04..4f49a3f7c8 100644
--- a/components/esp_rom/esp32c61/ld/esp32c61.rom.net80211.ld
+++ b/components/esp_rom/esp32c61/ld/esp32c61.rom.net80211.ld
@@ -31,7 +31,7 @@ ic_ebuf_recycle_rx = 0x40000a90;
 ic_ebuf_recycle_tx = 0x40000a94;
 ic_reset_rx_ba = 0x40000a98;
 ieee80211_align_eb = 0x40000a9c;
-ieee80211_ampdu_reorder = 0x40000aa0;
+/* ieee80211_ampdu_reorder = 0x40000aa0; */
 ieee80211_ampdu_start_age_timer = 0x40000aa4;
 ieee80211_encap_esfbuf = 0x40000aa8;
 ieee80211_is_tx_allowed = 0x40000aac;
diff --git a/components/esp_rom/esp32s3/ld/esp32s3.rom.ld b/components/esp_rom/esp32s3/ld/esp32s3.rom.ld
index ee709b79f9..05f36566a9 100644
--- a/components/esp_rom/esp32s3/ld/esp32s3.rom.ld
+++ b/components/esp_rom/esp32s3/ld/esp32s3.rom.ld
@@ -2002,7 +2002,7 @@ ic_ebuf_recycle_rx = 0x40005a24;
 ic_ebuf_recycle_tx = 0x40005a30;
 ic_reset_rx_ba = 0x40005a3c;
 ieee80211_align_eb = 0x40005a48;
-ieee80211_ampdu_reorder = 0x40005a54;
+/* ieee80211_ampdu_reorder = 0x40005a54; */
 ieee80211_ampdu_start_age_timer = 0x40005a60;
 /* ieee80211_encap_esfbuf = 0x40005a6c; */
 ieee80211_is_tx_allowed = 0x40005a78;
diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib
index 3da1bb58c1..52c5fd6537 160000
--- a/components/esp_wifi/lib
+++ b/components/esp_wifi/lib
@@ -1 +1 @@
-Subproject commit 3da1bb58c1e01efc56e479b7499afdb6286c8a23
+Subproject commit 52c5fd6537b7a97ff11673afa90dfec6bba251b6