diff --git a/recipes-wifi/linux-mac80211/files/patches-6.x/build/100-backports-drop-QRTR-and-MHI.patch b/recipes-wifi/linux-mac80211/files/patches-6.x/build/100-backports-drop-QRTR-and-MHI.patch
new file mode 100644
index 0000000..b017a0c
--- /dev/null
+++ b/recipes-wifi/linux-mac80211/files/patches-6.x/build/100-backports-drop-QRTR-and-MHI.patch
@@ -0,0 +1,76 @@
+From 54e0f9aaf340377fb76acdffee9ec7372c4b70ae Mon Sep 17 00:00:00 2001
+From: Robert Marko <robimarko@gmail.com>
+Date: Mon, 17 Oct 2022 11:35:36 +0200
+Subject: [PATCH] backports: drop QRTR and MHI
+
+Backports currently include QRTR and MHI due to ath11k-pci requiring them,
+however this at the same time prevents us from adding ath11k-ahb as it
+also requires QRTR however its AHB variant from the kernel will conflict
+with the core provided by backports.
+
+Since MHI also conflicts with existing OpenWrt kmods providing MHI drop
+both from backports and use the ones provided by OpenWrt kernel.
+
+Signed-off-by: Robert Marko <robimarko@gmail.com>
+---
+ Kconfig.sources                         | 2 --
+ Makefile.kernel                         | 2 --
+ drivers/net/wireless/ath/ath11k/Kconfig | 6 +++---
+ local-symbols                           | 8 --------
+ 4 files changed, 3 insertions(+), 15 deletions(-)
+
+--- a/Kconfig.sources
++++ b/Kconfig.sources
+@@ -4,8 +4,6 @@ source "$BACKPORT_DIR/compat/Kconfig"
+ # these are copied from the kernel
+ source "$BACKPORT_DIR/net/wireless/Kconfig"
+ source "$BACKPORT_DIR/net/mac80211/Kconfig"
+-source "$BACKPORT_DIR/net/qrtr/Kconfig"
+-source "$BACKPORT_DIR/drivers/bus/mhi/Kconfig"
+ source "$BACKPORT_DIR/drivers/soc/qcom/Kconfig"
+ source "$BACKPORT_DIR/drivers/net/wireless/Kconfig"
+ source "$BACKPORT_DIR/drivers/net/usb/Kconfig"
+--- a/Makefile.kernel
++++ b/Makefile.kernel
+@@ -39,9 +39,7 @@ obj-y += compat/
+ 
+ obj-$(CPTCFG_CFG80211) += net/wireless/
+ obj-$(CPTCFG_MAC80211) += net/mac80211/
+-obj-$(CPTCFG_QRTR) += net/qrtr/
+ obj-$(CPTCFG_QCOM_QMI_HELPERS) += drivers/soc/qcom/
+-obj-$(CPTCFG_MHI_BUS) += drivers/bus/mhi/
+ obj-$(CPTCFG_WLAN) += drivers/net/wireless/
+ obj-$(CPTCFG_USB_NET_RNDIS_WLAN) += drivers/net/usb/
+ 
+--- a/drivers/net/wireless/ath/ath11k/Kconfig
++++ b/drivers/net/wireless/ath/ath11k/Kconfig
+@@ -25,9 +25,9 @@ config ATH11K_PCI
+ 	tristate "Atheros ath11k PCI support"
+ 	depends on m
+ 	depends on ATH11K && PCI
+-	select MHI_BUS
+-	select QRTR
+-	select QRTR_MHI
++	depends on MHI_BUS
++	depends on QRTR
++	depends on QRTR_MHI
+ 	help
+ 	  This module adds support for PCIE bus
+ 
+--- a/local-symbols
++++ b/local-symbols
+@@ -65,14 +65,6 @@ MAC80211_MESH_PS_DEBUG=
+ MAC80211_TDLS_DEBUG=
+ MAC80211_DEBUG_COUNTERS=
+ MAC80211_STA_HASH_MAX_SIZE=
+-QRTR=
+-QRTR_SMD=
+-QRTR_TUN=
+-QRTR_MHI=
+-MHI_BUS=
+-MHI_BUS_DEBUG=
+-MHI_BUS_PCI_GENERIC=
+-MHI_BUS_EP=
+ QCOM_AOSS_QMP=
+ QCOM_COMMAND_DB=
+ QCOM_CPR=
diff --git a/recipes-wifi/linux-mac80211/files/patches-6.x/build/build.inc b/recipes-wifi/linux-mac80211/files/patches-6.x/build/build.inc
index b733e12..f8551ac 100644
--- a/recipes-wifi/linux-mac80211/files/patches-6.x/build/build.inc
+++ b/recipes-wifi/linux-mac80211/files/patches-6.x/build/build.inc
@@ -10,4 +10,5 @@
     file://070-remove-broken-wext-select.patch \
     file://080-resv_start_op.patch \
     file://090-bcma-otp.patch \
+    file://100-backports-drop-QRTR-and-MHI.patch \
     "
diff --git a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/307-wifi-mac80211-fix-initialization-of-rx-link-and-rx-l.patch b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/307-wifi-mac80211-fix-initialization-of-rx-link-and-rx-l.patch
index 5652c14..857c1c8 100644
--- a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/307-wifi-mac80211-fix-initialization-of-rx-link-and-rx-l.patch
+++ b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/307-wifi-mac80211-fix-initialization-of-rx-link-and-rx-l.patch
@@ -20,7 +20,7 @@
 
 --- a/net/mac80211/rx.c
 +++ b/net/mac80211/rx.c
-@@ -4067,6 +4067,55 @@ static void ieee80211_invoke_rx_handlers
+@@ -4067,6 +4067,56 @@ static void ieee80211_invoke_rx_handlers
  #undef CALL_RXH
  }
  
@@ -59,7 +59,8 @@
 +
 +	if (sta) {
 +		rx->local = sta->sdata->local;
-+		rx->sdata = sta->sdata;
++		if (!rx->sdata)
++			rx->sdata = sta->sdata;
 +		rx->link_sta = &sta->deflink;
 +
 +		if (link_id >= 0 &&
@@ -76,7 +77,7 @@
  /*
   * This function makes calls into the RX path, therefore
   * it has to be invoked under RCU read lock.
-@@ -4075,16 +4124,19 @@ void ieee80211_release_reorder_timeout(s
+@@ -4075,16 +4125,19 @@ void ieee80211_release_reorder_timeout(s
  {
  	struct sk_buff_head frames;
  	struct ieee80211_rx_data rx = {
@@ -101,7 +102,7 @@
  
  	tid_agg_rx = rcu_dereference(sta->ampdu_mlme.tid_rx[tid]);
  	if (!tid_agg_rx)
-@@ -4104,10 +4156,6 @@ void ieee80211_release_reorder_timeout(s
+@@ -4104,10 +4157,6 @@ void ieee80211_release_reorder_timeout(s
  		};
  		drv_event_callback(rx.local, rx.sdata, &event);
  	}
@@ -112,7 +113,7 @@
  
  	ieee80211_rx_handlers(&rx, &frames);
  }
-@@ -4123,7 +4171,6 @@ void ieee80211_mark_rx_ba_filtered_frame
+@@ -4123,7 +4172,6 @@ void ieee80211_mark_rx_ba_filtered_frame
  		/* This is OK -- must be QoS data frame */
  		.security_idx = tid,
  		.seqno_idx = tid,
@@ -120,7 +121,7 @@
  	};
  	int i, diff;
  
-@@ -4134,10 +4181,8 @@ void ieee80211_mark_rx_ba_filtered_frame
+@@ -4134,10 +4182,8 @@ void ieee80211_mark_rx_ba_filtered_frame
  
  	sta = container_of(pubsta, struct sta_info, sta);
  
@@ -133,7 +134,7 @@
  
  	rcu_read_lock();
  	tid_agg_rx = rcu_dereference(sta->ampdu_mlme.tid_rx[tid]);
-@@ -4524,15 +4569,6 @@ void ieee80211_check_fast_rx_iface(struc
+@@ -4524,15 +4570,6 @@ void ieee80211_check_fast_rx_iface(struc
  	mutex_unlock(&local->sta_mtx);
  }
  
@@ -149,7 +150,7 @@
  static void ieee80211_rx_8023(struct ieee80211_rx_data *rx,
  			      struct ieee80211_fast_rx *fast_rx,
  			      int orig_len)
-@@ -4643,7 +4679,6 @@ static bool ieee80211_invoke_fast_rx(str
+@@ -4643,7 +4680,6 @@ static bool ieee80211_invoke_fast_rx(str
  	struct sk_buff *skb = rx->skb;
  	struct ieee80211_hdr *hdr = (void *)skb->data;
  	struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);
@@ -157,7 +158,7 @@
  	int orig_len = skb->len;
  	int hdrlen = ieee80211_hdrlen(hdr->frame_control);
  	int snap_offs = hdrlen;
-@@ -4655,7 +4690,6 @@ static bool ieee80211_invoke_fast_rx(str
+@@ -4655,7 +4691,6 @@ static bool ieee80211_invoke_fast_rx(str
  		u8 da[ETH_ALEN];
  		u8 sa[ETH_ALEN];
  	} addrs __aligned(2);
@@ -165,7 +166,7 @@
  	struct ieee80211_sta_rx_stats *stats;
  
  	/* for parallel-rx, we need to have DUP_VALIDATED, otherwise we write
-@@ -4758,18 +4792,10 @@ static bool ieee80211_invoke_fast_rx(str
+@@ -4758,18 +4793,10 @@ static bool ieee80211_invoke_fast_rx(str
   drop:
  	dev_kfree_skb(skb);
  
@@ -186,15 +187,18 @@
  
  	stats->dropped++;
  	return true;
-@@ -4787,7 +4813,6 @@ static bool ieee80211_prepare_and_rx_han
+@@ -4787,8 +4814,8 @@ static bool ieee80211_prepare_and_rx_han
  	struct ieee80211_local *local = rx->local;
  	struct ieee80211_sub_if_data *sdata = rx->sdata;
  	struct ieee80211_hdr *hdr = (void *)skb->data;
 -	struct link_sta_info *link_sta = NULL;
- 	struct ieee80211_link_data *link;
+-	struct ieee80211_link_data *link;
++	struct link_sta_info *link_sta = rx->link_sta;
++	struct ieee80211_link_data *link = rx->link;
  
  	rx->skb = skb;
-@@ -4810,35 +4835,6 @@ static bool ieee80211_prepare_and_rx_han
+ 
+@@ -4810,35 +4837,6 @@ static bool ieee80211_prepare_and_rx_han
  	if (!ieee80211_accept_frame(rx))
  		return false;
  
@@ -230,7 +234,7 @@
  	if (!consume) {
  		struct skb_shared_hwtstamps *shwt;
  
-@@ -4858,16 +4854,16 @@ static bool ieee80211_prepare_and_rx_han
+@@ -4858,7 +4856,7 @@ static bool ieee80211_prepare_and_rx_han
  		shwt->hwtstamp = skb_hwtstamps(skb)->hwtstamp;
  	}
  
@@ -239,18 +243,7 @@
  		/* translate to MLD addresses */
  		if (ether_addr_equal(link->conf->addr, hdr->addr1))
  			ether_addr_copy(hdr->addr1, rx->sdata->vif.addr);
--		if (ether_addr_equal(link_sta->addr, hdr->addr2))
-+		if (ether_addr_equal(rx->link_sta->addr, hdr->addr2))
- 			ether_addr_copy(hdr->addr2, rx->sta->addr);
- 		/* translate A3 only if it's the BSSID */
- 		if (!ieee80211_has_tods(hdr->frame_control) &&
- 		    !ieee80211_has_fromds(hdr->frame_control)) {
--			if (ether_addr_equal(link_sta->addr, hdr->addr3))
-+			if (ether_addr_equal(rx->link_sta->addr, hdr->addr3))
- 				ether_addr_copy(hdr->addr3, rx->sta->addr);
- 			else if (ether_addr_equal(link->conf->addr, hdr->addr3))
- 				ether_addr_copy(hdr->addr3, rx->sdata->vif.addr);
-@@ -4888,6 +4884,7 @@ static void __ieee80211_rx_handle_8023(s
+@@ -4888,6 +4886,7 @@ static void __ieee80211_rx_handle_8023(s
  	struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);
  	struct ieee80211_fast_rx *fast_rx;
  	struct ieee80211_rx_data rx;
@@ -258,7 +251,7 @@
  
  	memset(&rx, 0, sizeof(rx));
  	rx.skb = skb;
-@@ -4904,12 +4901,8 @@ static void __ieee80211_rx_handle_8023(s
+@@ -4904,12 +4903,8 @@ static void __ieee80211_rx_handle_8023(s
  	if (!pubsta)
  		goto drop;
  
@@ -273,7 +266,7 @@
  
  	/*
  	 * TODO: Should the frame be dropped if the right link_id is not
-@@ -4918,19 +4911,8 @@ static void __ieee80211_rx_handle_8023(s
+@@ -4918,19 +4913,8 @@ static void __ieee80211_rx_handle_8023(s
  	 * link_id is used only for stats purpose and updating the stats on
  	 * the deflink is fine?
  	 */
@@ -295,7 +288,7 @@
  
  	fast_rx = rcu_dereference(rx.sta->fast_rx);
  	if (!fast_rx)
-@@ -4948,6 +4930,8 @@ static bool ieee80211_rx_for_interface(s
+@@ -4948,6 +4932,8 @@ static bool ieee80211_rx_for_interface(s
  {
  	struct link_sta_info *link_sta;
  	struct ieee80211_hdr *hdr = (void *)skb->data;
@@ -304,7 +297,7 @@
  
  	/*
  	 * Look up link station first, in case there's a
-@@ -4957,24 +4941,19 @@ static bool ieee80211_rx_for_interface(s
+@@ -4957,24 +4943,19 @@ static bool ieee80211_rx_for_interface(s
  	 */
  	link_sta = link_sta_info_get_bss(rx->sdata, hdr->addr2);
  	if (link_sta) {
@@ -337,7 +330,7 @@
  	return ieee80211_prepare_and_rx_handle(rx, skb, consume);
  }
  
-@@ -5033,19 +5012,15 @@ static void __ieee80211_rx_handle_packet
+@@ -5033,19 +5014,15 @@ static void __ieee80211_rx_handle_packet
  
  	if (ieee80211_is_data(fc)) {
  		struct sta_info *sta, *prev_sta;
@@ -362,7 +355,7 @@
  			/*
  			 * In MLO connection, fetch the link_id using addr2
  			 * when the driver does not pass link_id in status.
-@@ -5063,7 +5038,7 @@ static void __ieee80211_rx_handle_packet
+@@ -5063,7 +5040,7 @@ static void __ieee80211_rx_handle_packet
  				if (!link_sta)
  					goto out;
  
@@ -371,7 +364,7 @@
  			}
  
  			if (ieee80211_prepare_and_rx_handle(&rx, skb, true))
-@@ -5079,30 +5054,25 @@ static void __ieee80211_rx_handle_packet
+@@ -5079,30 +5056,25 @@ static void __ieee80211_rx_handle_packet
  				continue;
  			}
  
diff --git a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/900-mac80211-mtk-do-not-setup-twt-when-twt-responder-is-.patch b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/900-mac80211-mtk-do-not-setup-twt-when-twt-responder-is-.patch
index e9b5544..d016f3c 100644
--- a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/900-mac80211-mtk-do-not-setup-twt-when-twt-responder-is-.patch
+++ b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/900-mac80211-mtk-do-not-setup-twt-when-twt-responder-is-.patch
@@ -1,7 +1,7 @@
-From ad3c58a67fd28755ae75ac995ae404eb5c6c21b0 Mon Sep 17 00:00:00 2001
+From 3cd276528e86211747f4628e8d37804facbba749 Mon Sep 17 00:00:00 2001
 From: Peter Chiu <chui-hao.chiu@mediatek.com>
 Date: Tue, 18 Jan 2022 20:29:44 +0800
-Subject: [PATCH 900/908] mac80211: mtk: do not setup twt when twt responder is
+Subject: [PATCH 900/912] mac80211: mtk: do not setup twt when twt responder is
  false
 
 ---
@@ -23,5 +23,5 @@
  		return false;
  
 -- 
-2.18.0
+2.36.1
 
diff --git a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/901-nl80211-mtk-extend-CAC-time-for-weather-radar-channe.patch b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/901-nl80211-mtk-extend-CAC-time-for-weather-radar-channe.patch
index 57d18b4..ce3c0cc 100644
--- a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/901-nl80211-mtk-extend-CAC-time-for-weather-radar-channe.patch
+++ b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/901-nl80211-mtk-extend-CAC-time-for-weather-radar-channe.patch
@@ -1,7 +1,7 @@
-From 7b24c04be43656f0d305473119ba534a5720bc47 Mon Sep 17 00:00:00 2001
+From 12941f847db1f4ee7eb6d82a50eee9568fb532e2 Mon Sep 17 00:00:00 2001
 From: Shayne Chen <shayne.chen@mediatek.com>
 Date: Tue, 29 Mar 2022 16:06:30 +0800
-Subject: [PATCH 901/908] nl80211: mtk: extend CAC time for weather radar
+Subject: [PATCH 901/912] nl80211: mtk: extend CAC time for weather radar
  channels
 
 Signed-off-by: Shayne Chen <shayne.chen@mediatek.com>
@@ -28,5 +28,5 @@
  	if (!err) {
  		wdev->links[0].ap.chandef = chandef;
 -- 
-2.18.0
+2.36.1
 
diff --git a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/902-mac80211-mtk-it-s-invalid-case-when-frag_threshold-i.patch b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/902-mac80211-mtk-it-s-invalid-case-when-frag_threshold-i.patch
index 46a18f7..2a5a1db 100644
--- a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/902-mac80211-mtk-it-s-invalid-case-when-frag_threshold-i.patch
+++ b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/902-mac80211-mtk-it-s-invalid-case-when-frag_threshold-i.patch
@@ -1,7 +1,7 @@
-From e66fda08e681b11aa6a10bd7fd750d210cb22745 Mon Sep 17 00:00:00 2001
+From a5ea1addb072fe46a4a0c76c2844dce02ae4f1a6 Mon Sep 17 00:00:00 2001
 From: Bo Jiao <Bo.Jiao@mediatek.com>
 Date: Fri, 1 Apr 2022 09:15:21 +0800
-Subject: [PATCH 902/908] mac80211: mtk: it's invalid case when frag_threshold
+Subject: [PATCH 902/912] mac80211: mtk: it's invalid case when frag_threshold
  is greater than 2346
 
 Signed-off-by: Bo Jiao <Bo.Jiao@mediatek.com>
@@ -24,5 +24,5 @@
  			/*
  			 * Fragments (apart from the last one) are required to
 -- 
-2.18.0
+2.36.1
 
diff --git a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/903-mac80211-mtk-airtime_flags-depends-on-NL80211_EXT_FE.patch b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/903-mac80211-mtk-airtime_flags-depends-on-NL80211_EXT_FE.patch
index 0f72cb9..f250335 100644
--- a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/903-mac80211-mtk-airtime_flags-depends-on-NL80211_EXT_FE.patch
+++ b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/903-mac80211-mtk-airtime_flags-depends-on-NL80211_EXT_FE.patch
@@ -1,7 +1,7 @@
-From 9556fba48d305893fa27e6f0765c1e7985ac734c Mon Sep 17 00:00:00 2001
+From 27c84682bf5a0f935b736e03f1b1e3a6efe86303 Mon Sep 17 00:00:00 2001
 From: Evelyn Tsai <evelyn.tsai@mediatek.com>
 Date: Wed, 19 Oct 2022 13:42:43 +0800
-Subject: [PATCH 903/908] mac80211: mtk: airtime_flags depends on
+Subject: [PATCH 903/912] mac80211: mtk: airtime_flags depends on
  NL80211_EXT_FEATURE
 
 Signed-off-by: Evelyn Tsai <evelyn.tsai@mediatek.com>
@@ -26,5 +26,5 @@
  	atomic_set(&local->aql_total_pending_airtime, 0);
  
 -- 
-2.18.0
+2.36.1
 
diff --git a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/904-mac80211-mtk-add-support-for-runtime-set-inband-disc.patch b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/904-mac80211-mtk-add-support-for-runtime-set-inband-disc.patch
index cb7dbde..0ac929b 100644
--- a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/904-mac80211-mtk-add-support-for-runtime-set-inband-disc.patch
+++ b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/904-mac80211-mtk-add-support-for-runtime-set-inband-disc.patch
@@ -1,7 +1,7 @@
-From 2b41cfa0a72422f95b4c69be8141bb8579a87450 Mon Sep 17 00:00:00 2001
+From 83e08e8194b7e9d476c72e98a4b05b29329719cb Mon Sep 17 00:00:00 2001
 From: MeiChia Chiu <meichia.chiu@mediatek.com>
 Date: Wed, 19 Oct 2022 13:45:42 +0800
-Subject: [PATCH 904/908] mac80211: mtk: add support for runtime set inband
+Subject: [PATCH 904/912] mac80211: mtk: add support for runtime set inband
  discovery
 
 Signed-off-by: MeiChia Chiu <meichia.chiu@mediatek.com>
@@ -178,5 +178,5 @@
  }
  
 -- 
-2.18.0
+2.36.1
 
diff --git a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/905-mac80211-mtk-remove-timerout-handle-for-ax210-iot-is.patch b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/905-mac80211-mtk-remove-timerout-handle-for-ax210-iot-is.patch
index 86125b4..5a1a077 100644
--- a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/905-mac80211-mtk-remove-timerout-handle-for-ax210-iot-is.patch
+++ b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/905-mac80211-mtk-remove-timerout-handle-for-ax210-iot-is.patch
@@ -1,7 +1,7 @@
-From deb128a1f5fba61b131394729373e51a7afd0ec6 Mon Sep 17 00:00:00 2001
+From 81949f8987417079f838e188d621921c70ce0243 Mon Sep 17 00:00:00 2001
 From: Evelyn Tsai <evelyn.tsai@mediatek.com>
 Date: Wed, 19 Oct 2022 13:49:21 +0800
-Subject: [PATCH 905/908] mac80211: mtk: remove timerout handle for ax210 iot
+Subject: [PATCH 905/912] mac80211: mtk: remove timerout handle for ax210 iot
  issue
 
 Signed-off-by: Evelyn Tsai <evelyn.tsai@mediatek.com>
@@ -31,5 +31,5 @@
  	ht_dbg(sta->sdata, "tx session timer expired on %pM tid %d\n",
  	       sta->sta.addr, tid);
 -- 
-2.18.0
+2.36.1
 
diff --git a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/906-cfg80211-mtk-implement-DFS-status-show-cac-and-nop-s.patch b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/906-cfg80211-mtk-implement-DFS-status-show-cac-and-nop-s.patch
index f1b0542..ab81250 100644
--- a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/906-cfg80211-mtk-implement-DFS-status-show-cac-and-nop-s.patch
+++ b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/906-cfg80211-mtk-implement-DFS-status-show-cac-and-nop-s.patch
@@ -1,7 +1,7 @@
-From e9dbde98d01f963121febafa51f6e7bb68bef135 Mon Sep 17 00:00:00 2001
+From abbf219e25183195fe2ddb675dcb5747d8a53622 Mon Sep 17 00:00:00 2001
 From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
 Date: Thu, 22 Sep 2022 14:27:41 +0800
-Subject: [PATCH 906/908] cfg80211: mtk: implement DFS status show, cac and nop
+Subject: [PATCH 906/912] cfg80211: mtk: implement DFS status show, cac and nop
  skip command via debugfs
 
 Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
@@ -455,5 +455,5 @@
  
  #undef TRACE_INCLUDE_PATH
 -- 
-2.18.0
+2.36.1
 
diff --git a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/907-mac80211-mtk-Set-TWT-Information-Frame-Disabled-bit-.patch b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/907-mac80211-mtk-Set-TWT-Information-Frame-Disabled-bit-.patch
index 6f5adfd..31f77c7 100644
--- a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/907-mac80211-mtk-Set-TWT-Information-Frame-Disabled-bit-.patch
+++ b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/907-mac80211-mtk-Set-TWT-Information-Frame-Disabled-bit-.patch
@@ -1,7 +1,7 @@
-From 4781823ccaaca6cb075013aa8bbb2e733ddffb5f Mon Sep 17 00:00:00 2001
+From 9292503e99db5132eb8ca052e3574b5043f87579 Mon Sep 17 00:00:00 2001
 From: Howard Hsu <howard-yh.hsu@mediatek.com>
 Date: Tue, 4 Oct 2022 10:47:05 +0800
-Subject: [PATCH 907/908] mac80211: mtk: Set TWT Information Frame Disabled bit
+Subject: [PATCH 907/912] mac80211: mtk: Set TWT Information Frame Disabled bit
  as 1.
 
 This modification means that current implementation do not support twt information frame.
@@ -22,5 +22,5 @@
  	/* broadcast TWT not supported yet */
  	if (twt->control & IEEE80211_TWT_CONTROL_NEG_TYPE_BROADCAST) {
 -- 
-2.18.0
+2.36.1
 
diff --git a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/908-mac80211-mtk-fix-the-issue-of-AP-and-STA-starting-on.patch b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/908-mac80211-mtk-fix-the-issue-of-AP-and-STA-starting-on.patch
index fdb863e..d9bc05e 100644
--- a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/908-mac80211-mtk-fix-the-issue-of-AP-and-STA-starting-on.patch
+++ b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/908-mac80211-mtk-fix-the-issue-of-AP-and-STA-starting-on.patch
@@ -1,7 +1,7 @@
-From 5fcae1d998339e7d0632c8ae5781232f9e6e4b14 Mon Sep 17 00:00:00 2001
+From 4c503f7af8f53b6ad3de3f2df914da5f9ed1858f Mon Sep 17 00:00:00 2001
 From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
 Date: Wed, 5 Oct 2022 19:13:43 +0800
-Subject: [PATCH 908/908] mac80211: mtk: fix the issue of AP and STA starting
+Subject: [PATCH 908/912] mac80211: mtk: fix the issue of AP and STA starting
  on DFS channel concurrently
 
 Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
@@ -258,5 +258,5 @@
  
  #undef TRACE_INCLUDE_PATH
 -- 
-2.18.0
+2.36.1
 
diff --git a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/909-mac80211-mtk-check-the-control-channel-before-downgr.patch b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/909-mac80211-mtk-check-the-control-channel-before-downgr.patch
new file mode 100644
index 0000000..48eb6e9
--- /dev/null
+++ b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/909-mac80211-mtk-check-the-control-channel-before-downgr.patch
@@ -0,0 +1,54 @@
+From 1c406724813497c3a7679d67f53755c102be8f9a Mon Sep 17 00:00:00 2001
+From: Evelyn Tsai <evelyn.tsai@mediatek.com>
+Date: Fri, 16 Dec 2022 03:31:06 +0800
+Subject: [PATCH 909/912] mac80211: mtk: check the control channel before
+ downgrading the bandwidth
+
+---
+ net/mac80211/mlme.c | 23 +++++++++++++++++++++++
+ 1 file changed, 23 insertions(+)
+
+diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
+index d8484cd..8ab5c52 100644
+--- a/net/mac80211/mlme.c
++++ b/net/mac80211/mlme.c
+@@ -4582,6 +4582,26 @@ ieee80211_verify_sta_he_mcs_support(struct ieee80211_sub_if_data *sdata,
+ 	return false;
+ }
+ 
++static bool ieee80211_check_same_ctrl_channel(struct ieee80211_sub_if_data *sdata,
++					      const struct cfg80211_chan_def *chandef)
++{
++	struct ieee80211_local *local = sdata->local;
++	struct ieee80211_chanctx *ctx;
++
++	mutex_lock(&local->chanctx_mtx);
++	list_for_each_entry(ctx, &local->chanctx_list, list) {
++		if (ctx->replace_state == IEEE80211_CHANCTX_WILL_BE_REPLACED)
++			continue;
++		if (ctx->mode == IEEE80211_CHANCTX_EXCLUSIVE)
++			continue;
++		if (chandef->chan == ctx->conf.def.chan)
++			return true;
++	}
++
++	mutex_unlock(&local->chanctx_mtx);
++	return false;
++}
++
+ static int ieee80211_prep_channel(struct ieee80211_sub_if_data *sdata,
+ 				  struct ieee80211_link_data *link,
+ 				  struct cfg80211_bss *cbss,
+@@ -4808,6 +4828,9 @@ static int ieee80211_prep_channel(struct ieee80211_sub_if_data *sdata,
+ 	    chandef.width == NL80211_CHAN_WIDTH_10)
+ 		goto out;
+ 
++	if (!ret || !ieee80211_check_same_ctrl_channel(sdata, &chandef))
++		goto out;
++
+ 	while (ret && chandef.width != NL80211_CHAN_WIDTH_20_NOHT) {
+ 		*conn_flags |=
+ 			ieee80211_chandef_downgrade(&chandef);
+-- 
+2.36.1
+
diff --git a/recipes-wifi/linux-mac80211/files/patches/subsys/912-mac80211-mtk-fix-tx-amsdu-aggregation.patch b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/910-mac80211-mtk-fix-tx-amsdu-aggregation.patch
similarity index 86%
copy from recipes-wifi/linux-mac80211/files/patches/subsys/912-mac80211-mtk-fix-tx-amsdu-aggregation.patch
copy to recipes-wifi/linux-mac80211/files/patches-6.x/subsys/910-mac80211-mtk-fix-tx-amsdu-aggregation.patch
index 15f19d3..aba73e7 100644
--- a/recipes-wifi/linux-mac80211/files/patches/subsys/912-mac80211-mtk-fix-tx-amsdu-aggregation.patch
+++ b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/910-mac80211-mtk-fix-tx-amsdu-aggregation.patch
@@ -1,7 +1,7 @@
-From 43a5e3f9890c25ec18756ba12b709c7a0e60404b Mon Sep 17 00:00:00 2001
+From 63eb14a66a1ed384a0bb952b9b50fe81a859690a Mon Sep 17 00:00:00 2001
 From: TomLiu <tomml.liu@mediatek.com>
 Date: Wed, 14 Dec 2022 00:26:50 -0800
-Subject: [PATCH]mac80211-mtk-fix-tx-amsdu-aggregation
+Subject: [PATCH 910/912] mac80211: mtk: fix tx amsdu aggregation
 
 ---
  include/net/mac80211.h | 7 +++++++
@@ -9,10 +9,10 @@
  2 files changed, 11 insertions(+), 2 deletions(-)
 
 diff --git a/include/net/mac80211.h b/include/net/mac80211.h
-index 9a38b9f..bf4469b 100755
+index 4485cfa..5429de0 100644
 --- a/include/net/mac80211.h
 +++ b/include/net/mac80211.h
-@@ -2675,6 +2675,13 @@ static inline void _ieee80211_hw_set(struct ieee80211_hw *hw,
+@@ -2851,6 +2851,13 @@ static inline void _ieee80211_hw_set(struct ieee80211_hw *hw,
  }
  #define ieee80211_hw_set(hw, flg)	_ieee80211_hw_set(hw, IEEE80211_HW_##flg)
  
@@ -27,7 +27,7 @@
   * struct ieee80211_scan_request - hw scan request
   *
 diff --git a/net/mac80211/agg-tx.c b/net/mac80211/agg-tx.c
-index c30f02d..f43f653 100755
+index 1f46561..318c71e 100755
 --- a/net/mac80211/agg-tx.c
 +++ b/net/mac80211/agg-tx.c
 @@ -66,7 +66,8 @@ static void ieee80211_send_addba_request(struct ieee80211_sub_if_data *sdata,
@@ -51,5 +51,5 @@
  	capab |= u16_encode_bits(tid, IEEE80211_ADDBA_PARAM_TID_MASK);
  	capab |= u16_encode_bits(agg_size, IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK);
 -- 
-2.32.0
+2.36.1
 
diff --git a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/99900-mac80211-mtk-add-fill-receive-path-ops-to-get-wed-i.patch b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/99900-mac80211-mtk-add-fill-receive-path-ops-to-get-wed-i.patch
index 8ffd6f5..b755139 100644
--- a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/99900-mac80211-mtk-add-fill-receive-path-ops-to-get-wed-i.patch
+++ b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/99900-mac80211-mtk-add-fill-receive-path-ops-to-get-wed-i.patch
@@ -1,4 +1,4 @@
-From 447d620689b705b1e6e382a8bae59930e74e257c Mon Sep 17 00:00:00 2001
+From 2fddf05d7d9786a42466ec504c890f91e1944612 Mon Sep 17 00:00:00 2001
 From: Sujuan Chen <sujuan.chen@mediatek.com>
 Date: Wed, 18 May 2022 15:10:22 +0800
 Subject: [PATCH 99900/99901] mac80211: mtk: add fill receive path ops to get
@@ -14,7 +14,7 @@
  mode change 100644 => 100755 net/mac80211/util.c
 
 diff --git a/include/net/mac80211.h b/include/net/mac80211.h
-index 4485cfa..fe686a4 100644
+index 5429de0..dd9e834 100644
 --- a/include/net/mac80211.h
 +++ b/include/net/mac80211.h
 @@ -1354,7 +1354,7 @@ ieee80211_tx_info_clear_status(struct ieee80211_tx_info *info)
@@ -48,7 +48,7 @@
  /**
   * lockdep_vif_mutex_held - for lockdep checks on link poiners
   * @vif: the interface to check
-@@ -4173,6 +4179,8 @@ struct ieee80211_prep_tx_info {
+@@ -4180,6 +4186,8 @@ struct ieee80211_prep_tx_info {
   *	Note that a sta can also be inserted or removed with valid links,
   *	i.e. passed to @sta_add/@sta_state with sta->valid_links not zero.
   *	In fact, cannot change from having valid_links and not having them.
@@ -57,7 +57,7 @@
   */
  struct ieee80211_ops {
  	void (*tx)(struct ieee80211_hw *hw,
-@@ -4528,6 +4536,9 @@ struct ieee80211_ops {
+@@ -4535,6 +4543,9 @@ struct ieee80211_ops {
  				struct ieee80211_vif *vif,
  				struct ieee80211_sta *sta,
  				u16 old_links, u16 new_links);
@@ -154,5 +154,5 @@
   * Nothing should have been stuffed into the workqueue during
   * the suspend->resume cycle. Since we can't check each caller
 -- 
-2.18.0
+2.36.1
 
diff --git a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/99901-fix-build-failed.patch b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/99999-mac80211-mtk-fix-build-error-on-Linux-Kernel-5.4.patch
similarity index 92%
rename from recipes-wifi/linux-mac80211/files/patches-6.x/subsys/99901-fix-build-failed.patch
rename to recipes-wifi/linux-mac80211/files/patches-6.x/subsys/99999-mac80211-mtk-fix-build-error-on-Linux-Kernel-5.4.patch
index 6731827..a7bb3c4 100644
--- a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/99901-fix-build-failed.patch
+++ b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/99999-mac80211-mtk-fix-build-error-on-Linux-Kernel-5.4.patch
@@ -1,7 +1,7 @@
-From 58619705cdbd28520ddf730eba94c3f5dfca04dc Mon Sep 17 00:00:00 2001
-From: Peter Chiu <chui-hao.chiu@mediatek.com>
-Date: Mon, 12 Dec 2022 15:08:10 +0800
-Subject: [PATCH 99901/99901] fix build failed
+From 4ca1834f804f70ffea6f95720d6145a56cd0414b Mon Sep 17 00:00:00 2001
+From: Evelyn Tsai <evelyn.tsai@mediatek.com>
+Date: Tue, 13 Dec 2022 09:04:49 +0800
+Subject: [PATCH] mac80211: mtk: fix build error on Linux Kernel 5.4
 
 ---
  include/linux/ieee80211.h          | 8 +++-----
@@ -93,5 +93,5 @@
  	.resv_start_op = NL80211_CMD_REMOVE_LINK_STA + 1,
  #endif
 -- 
-2.18.0
+2.36.1
 
diff --git a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/subsys.inc b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/subsys.inc
index 3a7baed..230697b 100644
--- a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/subsys.inc
+++ b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/subsys.inc
@@ -28,6 +28,8 @@
     file://906-cfg80211-mtk-implement-DFS-status-show-cac-and-nop-s.patch \
     file://907-mac80211-mtk-Set-TWT-Information-Frame-Disabled-bit-.patch \
     file://908-mac80211-mtk-fix-the-issue-of-AP-and-STA-starting-on.patch \
+    file://909-mac80211-mtk-check-the-control-channel-before-downgr.patch \
+    file://910-mac80211-mtk-fix-tx-amsdu-aggregation.patch \
     file://99900-mac80211-mtk-add-fill-receive-path-ops-to-get-wed-i.patch \
-    file://99901-fix-build-failed.patch \
+    file://99999-mac80211-mtk-fix-build-error-on-Linux-Kernel-5.4.patch \
     "
diff --git a/recipes-wifi/linux-mac80211/files/patches/subsys/900-mac80211-mtk-do-not-setup-twt-when-twt-responder-is-.patch b/recipes-wifi/linux-mac80211/files/patches/subsys/900-mac80211-mtk-do-not-setup-twt-when-twt-responder-is-.patch
index d26fe38..2220bd5 100644
--- a/recipes-wifi/linux-mac80211/files/patches/subsys/900-mac80211-mtk-do-not-setup-twt-when-twt-responder-is-.patch
+++ b/recipes-wifi/linux-mac80211/files/patches/subsys/900-mac80211-mtk-do-not-setup-twt-when-twt-responder-is-.patch
@@ -1,7 +1,7 @@
-From 78275901240835e58b0f883065061f90c7fba310 Mon Sep 17 00:00:00 2001
+From 1fded844c3c65b3a4f2d18e982cafca4800585eb Mon Sep 17 00:00:00 2001
 From: Peter Chiu <chui-hao.chiu@mediatek.com>
 Date: Tue, 18 Jan 2022 20:29:44 +0800
-Subject: [PATCH 900/911] mac80211: mtk: do not setup twt when twt responder is
+Subject: [PATCH 900/915] mac80211: mtk: do not setup twt when twt responder is
  false
 
 ---
diff --git a/recipes-wifi/linux-mac80211/files/patches/subsys/901-nl80211-mtk-extend-CAC-time-for-weather-radar-channe.patch b/recipes-wifi/linux-mac80211/files/patches/subsys/901-nl80211-mtk-extend-CAC-time-for-weather-radar-channe.patch
index 6702727..6a3a5d0 100644
--- a/recipes-wifi/linux-mac80211/files/patches/subsys/901-nl80211-mtk-extend-CAC-time-for-weather-radar-channe.patch
+++ b/recipes-wifi/linux-mac80211/files/patches/subsys/901-nl80211-mtk-extend-CAC-time-for-weather-radar-channe.patch
@@ -1,7 +1,7 @@
-From fbe3cb1d42673c431f0f933620d0a1ec86a41113 Mon Sep 17 00:00:00 2001
+From 42c470a1d65511904885f7a357bda4cf2b895d94 Mon Sep 17 00:00:00 2001
 From: Shayne Chen <shayne.chen@mediatek.com>
 Date: Tue, 29 Mar 2022 16:06:30 +0800
-Subject: [PATCH 901/911] nl80211: mtk: extend CAC time for weather radar
+Subject: [PATCH 901/915] nl80211: mtk: extend CAC time for weather radar
  channels
 
 Signed-off-by: Shayne Chen <shayne.chen@mediatek.com>
diff --git a/recipes-wifi/linux-mac80211/files/patches/subsys/902-mac80211-mtk-it-s-invalid-case-when-frag_threshold-i.patch b/recipes-wifi/linux-mac80211/files/patches/subsys/902-mac80211-mtk-it-s-invalid-case-when-frag_threshold-i.patch
index da34346..22a4601 100644
--- a/recipes-wifi/linux-mac80211/files/patches/subsys/902-mac80211-mtk-it-s-invalid-case-when-frag_threshold-i.patch
+++ b/recipes-wifi/linux-mac80211/files/patches/subsys/902-mac80211-mtk-it-s-invalid-case-when-frag_threshold-i.patch
@@ -1,7 +1,7 @@
-From 0bc1d2e42f5424d5f784d89a9e65cb9cac494269 Mon Sep 17 00:00:00 2001
+From f8b036ca22bbac4a1a8fda5f7e7d63f955afb100 Mon Sep 17 00:00:00 2001
 From: Bo Jiao <Bo.Jiao@mediatek.com>
 Date: Fri, 1 Apr 2022 09:15:21 +0800
-Subject: [PATCH 902/911] mac80211: mtk: it's invalid case when frag_threshold
+Subject: [PATCH 902/915] mac80211: mtk: it's invalid case when frag_threshold
  is greater than 2346
 
 Signed-off-by: Bo Jiao <Bo.Jiao@mediatek.com>
diff --git a/recipes-wifi/linux-mac80211/files/patches/subsys/903-mac80211-mtk-correct-legacy-rates-check-in-ieee80211.patch b/recipes-wifi/linux-mac80211/files/patches/subsys/903-mac80211-mtk-correct-legacy-rates-check-in-ieee80211.patch
index d64a09b..ce89e15 100644
--- a/recipes-wifi/linux-mac80211/files/patches/subsys/903-mac80211-mtk-correct-legacy-rates-check-in-ieee80211.patch
+++ b/recipes-wifi/linux-mac80211/files/patches/subsys/903-mac80211-mtk-correct-legacy-rates-check-in-ieee80211.patch
@@ -1,7 +1,7 @@
-From 82549ae647667d825f49e67b8f21fa39db67ec13 Mon Sep 17 00:00:00 2001
+From a0d208456ae062aa982e29df3f77ae5f5f63d37f Mon Sep 17 00:00:00 2001
 From: MeiChia Chiu <MeiChia.Chiu@mediatek.com>
 Date: Mon, 7 Mar 2022 15:18:00 +0800
-Subject: [PATCH 903/911] mac80211: mtk: correct legacy rates check in
+Subject: [PATCH 903/915] mac80211: mtk: correct legacy rates check in
  ieee80211_calc_rx_airtime
 
 There are no legacy rates on 60GHz or sub-1Ghz band, so modify the check.
diff --git a/recipes-wifi/linux-mac80211/files/patches/subsys/904-mac80211-mtk-airtime_flags-depends-on-NL80211_EXT_FE.patch b/recipes-wifi/linux-mac80211/files/patches/subsys/904-mac80211-mtk-airtime_flags-depends-on-NL80211_EXT_FE.patch
index 68976b2..6db059b 100644
--- a/recipes-wifi/linux-mac80211/files/patches/subsys/904-mac80211-mtk-airtime_flags-depends-on-NL80211_EXT_FE.patch
+++ b/recipes-wifi/linux-mac80211/files/patches/subsys/904-mac80211-mtk-airtime_flags-depends-on-NL80211_EXT_FE.patch
@@ -1,7 +1,7 @@
-From 9a01b1fb748c13c9b3e6b670de80d9e41909f917 Mon Sep 17 00:00:00 2001
+From 927a444714dd12e688b1d9198107f68391177f1c Mon Sep 17 00:00:00 2001
 From: Evelyn Tsai <evelyn.tsai@mediatek.com>
 Date: Wed, 19 Oct 2022 13:42:43 +0800
-Subject: [PATCH 904/911] mac80211: mtk: airtime_flags depends on
+Subject: [PATCH 904/915] mac80211: mtk: airtime_flags depends on
  NL80211_EXT_FEATURE
 
 Signed-off-by: Evelyn Tsai <evelyn.tsai@mediatek.com>
@@ -10,7 +10,7 @@
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/net/mac80211/main.c b/net/mac80211/main.c
-index 09e5bf1..8c005f1 100644
+index e87ff30..769071a 100644
 --- a/net/mac80211/main.c
 +++ b/net/mac80211/main.c
 @@ -721,8 +721,9 @@ struct ieee80211_hw *ieee80211_alloc_hw_nm(size_t priv_data_len,
diff --git a/recipes-wifi/linux-mac80211/files/patches/subsys/905-mac80211-mtk-add-support-for-runtime-set-inband-disc.patch b/recipes-wifi/linux-mac80211/files/patches/subsys/905-mac80211-mtk-add-support-for-runtime-set-inband-disc.patch
index 04614d9..3e858cf 100644
--- a/recipes-wifi/linux-mac80211/files/patches/subsys/905-mac80211-mtk-add-support-for-runtime-set-inband-disc.patch
+++ b/recipes-wifi/linux-mac80211/files/patches/subsys/905-mac80211-mtk-add-support-for-runtime-set-inband-disc.patch
@@ -1,7 +1,7 @@
-From 31e449f812b7ca3f4bdea98c63f2d98bc740a112 Mon Sep 17 00:00:00 2001
+From b1b6d0d3c16cb024164fd559c9519fac2caff967 Mon Sep 17 00:00:00 2001
 From: MeiChia Chiu <meichia.chiu@mediatek.com>
 Date: Wed, 19 Oct 2022 13:45:42 +0800
-Subject: [PATCH 905/911] mac80211: mtk: add support for runtime set inband
+Subject: [PATCH 905/915] mac80211: mtk: add support for runtime set inband
  discovery
 
 Signed-off-by: MeiChia Chiu <meichia.chiu@mediatek.com>
@@ -50,7 +50,7 @@
  	/* keep last */
  	__NL80211_FILS_DISCOVERY_ATTR_LAST,
 diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
-index abe7318..bf71594 100644
+index 0711c75..544dcf5 100644
 --- a/net/mac80211/cfg.c
 +++ b/net/mac80211/cfg.c
 @@ -906,6 +906,7 @@ static int ieee80211_set_fils_discovery(struct ieee80211_sub_if_data *sdata,
diff --git a/recipes-wifi/linux-mac80211/files/patches/subsys/906-mac80211-mtk-add-s1g-category-to-_ieee80211_is_robus.patch b/recipes-wifi/linux-mac80211/files/patches/subsys/906-mac80211-mtk-add-s1g-category-to-_ieee80211_is_robus.patch
index 3e40887..653aecd 100644
--- a/recipes-wifi/linux-mac80211/files/patches/subsys/906-mac80211-mtk-add-s1g-category-to-_ieee80211_is_robus.patch
+++ b/recipes-wifi/linux-mac80211/files/patches/subsys/906-mac80211-mtk-add-s1g-category-to-_ieee80211_is_robus.patch
@@ -1,7 +1,7 @@
-From ae2162e1fe69af7ecc0c0ab5e8c2411ed2d5e77b Mon Sep 17 00:00:00 2001
+From d6291296d689ccbe2703b9c63afb15cc04fd54ac Mon Sep 17 00:00:00 2001
 From: Peter Chiu <chui-hao.chiu@mediatek.com>
 Date: Wed, 8 Jun 2022 10:26:39 +0800
-Subject: [PATCH 906/911] mac80211: mtk: add s1g category to
+Subject: [PATCH 906/915] mac80211: mtk: add s1g category to
  _ieee80211_is_robust_mgmt_frame
 
 Unprotected S1G with code 22 is not robust mgmt frame.
diff --git a/recipes-wifi/linux-mac80211/files/patches/subsys/907-mac80211-mtk-make-4addr-null-frames-using-min_rate-f.patch b/recipes-wifi/linux-mac80211/files/patches/subsys/907-mac80211-mtk-make-4addr-null-frames-using-min_rate-f.patch
index abf673b..2baa0e4 100644
--- a/recipes-wifi/linux-mac80211/files/patches/subsys/907-mac80211-mtk-make-4addr-null-frames-using-min_rate-f.patch
+++ b/recipes-wifi/linux-mac80211/files/patches/subsys/907-mac80211-mtk-make-4addr-null-frames-using-min_rate-f.patch
@@ -1,7 +1,7 @@
-From 59a306cfe40a251e8c5deaa30367aa56cfc81d4b Mon Sep 17 00:00:00 2001
+From 2de246272473407aa13d893b4195e1b9496d3c24 Mon Sep 17 00:00:00 2001
 From: Lian Chen <lian.chen@mediatek.com>
 Date: Thu, 14 Jul 2022 16:33:58 +0800
-Subject: [PATCH 907/911] mac80211: mtk: make 4addr null frames using min_rate
+Subject: [PATCH 907/915] mac80211: mtk: make 4addr null frames using min_rate
  for WDS
 
 WDS needs 4addr packets to trigger AP for wlan0.sta creation.
diff --git a/recipes-wifi/linux-mac80211/files/patches/subsys/908-mac80211-mtk-remove-timerout-handle-for-ax210-iot-is.patch b/recipes-wifi/linux-mac80211/files/patches/subsys/908-mac80211-mtk-remove-timerout-handle-for-ax210-iot-is.patch
index 9fe63f2..50f2684 100644
--- a/recipes-wifi/linux-mac80211/files/patches/subsys/908-mac80211-mtk-remove-timerout-handle-for-ax210-iot-is.patch
+++ b/recipes-wifi/linux-mac80211/files/patches/subsys/908-mac80211-mtk-remove-timerout-handle-for-ax210-iot-is.patch
@@ -1,7 +1,7 @@
-From 7f8cf0873db7d96ceba1dc30804ff16a86e81e6b Mon Sep 17 00:00:00 2001
+From 733277b58ef0b13581c4c22231003f1910d60a5b Mon Sep 17 00:00:00 2001
 From: Evelyn Tsai <evelyn.tsai@mediatek.com>
 Date: Wed, 19 Oct 2022 13:49:21 +0800
-Subject: [PATCH 908/911] mac80211: mtk: remove timerout handle for ax210 iot
+Subject: [PATCH 908/915] mac80211: mtk: remove timerout handle for ax210 iot
  issue
 
 Signed-off-by: Evelyn Tsai <evelyn.tsai@mediatek.com>
diff --git a/recipes-wifi/linux-mac80211/files/patches/subsys/909-cfg80211-mtk-implement-DFS-status-show-cac-and-nop-s.patch b/recipes-wifi/linux-mac80211/files/patches/subsys/909-cfg80211-mtk-implement-DFS-status-show-cac-and-nop-s.patch
index b2c2cff..e2bfe16 100644
--- a/recipes-wifi/linux-mac80211/files/patches/subsys/909-cfg80211-mtk-implement-DFS-status-show-cac-and-nop-s.patch
+++ b/recipes-wifi/linux-mac80211/files/patches/subsys/909-cfg80211-mtk-implement-DFS-status-show-cac-and-nop-s.patch
@@ -1,7 +1,7 @@
-From 6d245b62cf147bb813898da2ccb43a14ae0fac5c Mon Sep 17 00:00:00 2001
+From 316a7218dbbfa48fbd030cb64fb3693edf00e276 Mon Sep 17 00:00:00 2001
 From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
 Date: Thu, 22 Sep 2022 14:27:41 +0800
-Subject: [PATCH 909/911] cfg80211: mtk: implement DFS status show, cac and nop
+Subject: [PATCH 909/915] cfg80211: mtk: implement DFS status show, cac and nop
  skip command via debugfs
 
 Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
@@ -28,10 +28,10 @@
  
  /*
 diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
-index bf71594..97c5e5d 100644
+index 544dcf5..0a6257d 100644
 --- a/net/mac80211/cfg.c
 +++ b/net/mac80211/cfg.c
-@@ -4504,6 +4504,24 @@ ieee80211_set_radar_background(struct wiphy *wiphy,
+@@ -4501,6 +4501,24 @@ ieee80211_set_radar_background(struct wiphy *wiphy,
  	return local->ops->set_radar_background(&local->hw, chandef);
  }
  
@@ -56,7 +56,7 @@
  const struct cfg80211_ops mac80211_config_ops = {
  	.add_virtual_intf = ieee80211_add_iface,
  	.del_virtual_intf = ieee80211_del_iface,
-@@ -4610,4 +4628,5 @@ const struct cfg80211_ops mac80211_config_ops = {
+@@ -4607,4 +4625,5 @@ const struct cfg80211_ops mac80211_config_ops = {
  	.set_sar_specs = ieee80211_set_sar_specs,
  	.color_change = ieee80211_color_change,
  	.set_radar_background = ieee80211_set_radar_background,
diff --git a/recipes-wifi/linux-mac80211/files/patches/subsys/910-mac80211-mtk-Set-TWT-Information-Frame-Disabled-bit-.patch b/recipes-wifi/linux-mac80211/files/patches/subsys/910-mac80211-mtk-Set-TWT-Information-Frame-Disabled-bit-.patch
index 515ed03..b1ebe5d 100644
--- a/recipes-wifi/linux-mac80211/files/patches/subsys/910-mac80211-mtk-Set-TWT-Information-Frame-Disabled-bit-.patch
+++ b/recipes-wifi/linux-mac80211/files/patches/subsys/910-mac80211-mtk-Set-TWT-Information-Frame-Disabled-bit-.patch
@@ -1,7 +1,7 @@
-From e70aa68fef1e04812c3a3ba57ad1f525302accd7 Mon Sep 17 00:00:00 2001
+From 267ec2c325b0989e2c8491af5af051f9afee4676 Mon Sep 17 00:00:00 2001
 From: Howard Hsu <howard-yh.hsu@mediatek.com>
 Date: Tue, 4 Oct 2022 10:47:05 +0800
-Subject: [PATCH 910/911] mac80211: mtk: Set TWT Information Frame Disabled bit
+Subject: [PATCH 910/915] mac80211: mtk: Set TWT Information Frame Disabled bit
  as 1.
 
 This modification means that current implementation do not support twt information frame.
@@ -10,7 +10,7 @@
  1 file changed, 1 insertion(+)
 
 diff --git a/net/mac80211/s1g.c b/net/mac80211/s1g.c
-index 4141bc8..82da404 100644
+index 10b34bc..ecb37b9 100644
 --- a/net/mac80211/s1g.c
 +++ b/net/mac80211/s1g.c
 @@ -101,6 +101,7 @@ ieee80211_s1g_rx_twt_setup(struct ieee80211_sub_if_data *sdata,
diff --git a/recipes-wifi/linux-mac80211/files/patches/subsys/911-mac80211-mtk-fix-the-issue-of-AP-and-STA-starting-on.patch b/recipes-wifi/linux-mac80211/files/patches/subsys/911-mac80211-mtk-fix-the-issue-of-AP-and-STA-starting-on.patch
index 1199df9..b089f6a 100644
--- a/recipes-wifi/linux-mac80211/files/patches/subsys/911-mac80211-mtk-fix-the-issue-of-AP-and-STA-starting-on.patch
+++ b/recipes-wifi/linux-mac80211/files/patches/subsys/911-mac80211-mtk-fix-the-issue-of-AP-and-STA-starting-on.patch
@@ -1,7 +1,7 @@
-From c3fa5e627f8c552852ee25ab366b4035c203aab3 Mon Sep 17 00:00:00 2001
+From 7aebd936d9c3b2f1d1bbd2d9e9996b67fde989a1 Mon Sep 17 00:00:00 2001
 From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
 Date: Wed, 5 Oct 2022 19:13:43 +0800
-Subject: [PATCH 911/911] mac80211: mtk: fix the issue of AP and STA starting
+Subject: [PATCH 911/915] mac80211: mtk: fix the issue of AP and STA starting
  on DFS channel concurrently
 
 Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
@@ -76,10 +76,10 @@
  	NUM_NL80211_ATTR = __NL80211_ATTR_AFTER_LAST,
  	NL80211_ATTR_MAX = __NL80211_ATTR_AFTER_LAST - 1
 diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
-index 97c5e5d..d726410 100644
+index 0a6257d..a7b6284 100644
 --- a/net/mac80211/cfg.c
 +++ b/net/mac80211/cfg.c
-@@ -4522,6 +4522,49 @@ ieee80211_skip_cac(struct wireless_dev *wdev)
+@@ -4519,6 +4519,49 @@ ieee80211_skip_cac(struct wireless_dev *wdev)
  	}
  }
  
@@ -129,7 +129,7 @@
  const struct cfg80211_ops mac80211_config_ops = {
  	.add_virtual_intf = ieee80211_add_iface,
  	.del_virtual_intf = ieee80211_del_iface,
-@@ -4629,4 +4672,5 @@ const struct cfg80211_ops mac80211_config_ops = {
+@@ -4626,4 +4669,5 @@ const struct cfg80211_ops mac80211_config_ops = {
  	.color_change = ieee80211_color_change,
  	.set_radar_background = ieee80211_set_radar_background,
  	.skip_cac = ieee80211_skip_cac,
diff --git a/recipes-wifi/linux-mac80211/files/patches/subsys/912-mac80211-mtk-check-the-control-channel-before-downgr.patch b/recipes-wifi/linux-mac80211/files/patches/subsys/912-mac80211-mtk-check-the-control-channel-before-downgr.patch
index 1f115ef..cf2f1b5 100644
--- a/recipes-wifi/linux-mac80211/files/patches/subsys/912-mac80211-mtk-check-the-control-channel-before-downgr.patch
+++ b/recipes-wifi/linux-mac80211/files/patches/subsys/912-mac80211-mtk-check-the-control-channel-before-downgr.patch
@@ -1,8 +1,8 @@
-From 8fe4d8388de19d99992da0dd6ba0ae90ed4141e9 Mon Sep 17 00:00:00 2001
+From 0d87b80d522117ea4c074ff3f7767f76fdd3df2d Mon Sep 17 00:00:00 2001
 From: mtk31095 <michael-cy.lee@mediatek.com>
 Date: Fri, 16 Dec 2022 10:37:53 +0800
-Subject: [PATCH] mac80211: mtk: check the control channel before downgrading
- the bandwidth
+Subject: [PATCH 912/915] mac80211: mtk: check the control channel before
+ downgrading the bandwidth
 
 Signed-off-by: mtk31095 <michael-cy.lee@mediatek.com>
 ---
@@ -51,5 +51,5 @@
  		ifmgd->flags |= ieee80211_chandef_downgrade(&chandef);
  		ret = ieee80211_vif_use_channel(sdata, &chandef,
 -- 
-2.25.1
+2.36.1
 
diff --git a/recipes-wifi/linux-mac80211/files/patches/subsys/912-mac80211-mtk-fix-tx-amsdu-aggregation.patch b/recipes-wifi/linux-mac80211/files/patches/subsys/913-mac80211-mtk-fix-tx-amsdu-aggregation.patch
similarity index 88%
rename from recipes-wifi/linux-mac80211/files/patches/subsys/912-mac80211-mtk-fix-tx-amsdu-aggregation.patch
rename to recipes-wifi/linux-mac80211/files/patches/subsys/913-mac80211-mtk-fix-tx-amsdu-aggregation.patch
index 15f19d3..371958d 100644
--- a/recipes-wifi/linux-mac80211/files/patches/subsys/912-mac80211-mtk-fix-tx-amsdu-aggregation.patch
+++ b/recipes-wifi/linux-mac80211/files/patches/subsys/913-mac80211-mtk-fix-tx-amsdu-aggregation.patch
@@ -1,7 +1,7 @@
-From 43a5e3f9890c25ec18756ba12b709c7a0e60404b Mon Sep 17 00:00:00 2001
+From 491811bea8080d41f28438947d51c712ccf91d0e Mon Sep 17 00:00:00 2001
 From: TomLiu <tomml.liu@mediatek.com>
 Date: Wed, 14 Dec 2022 00:26:50 -0800
-Subject: [PATCH]mac80211-mtk-fix-tx-amsdu-aggregation
+Subject: [PATCH 913/915] mac80211: mtk: fix tx amsdu aggregation
 
 ---
  include/net/mac80211.h | 7 +++++++
@@ -9,10 +9,10 @@
  2 files changed, 11 insertions(+), 2 deletions(-)
 
 diff --git a/include/net/mac80211.h b/include/net/mac80211.h
-index 9a38b9f..bf4469b 100755
+index 66fedf6..4539610 100644
 --- a/include/net/mac80211.h
 +++ b/include/net/mac80211.h
-@@ -2675,6 +2675,13 @@ static inline void _ieee80211_hw_set(struct ieee80211_hw *hw,
+@@ -2668,6 +2668,13 @@ static inline void _ieee80211_hw_set(struct ieee80211_hw *hw,
  }
  #define ieee80211_hw_set(hw, flg)	_ieee80211_hw_set(hw, IEEE80211_HW_##flg)
  
@@ -51,5 +51,5 @@
  	capab |= u16_encode_bits(tid, IEEE80211_ADDBA_PARAM_TID_MASK);
  	capab |= u16_encode_bits(agg_size, IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK);
 -- 
-2.32.0
+2.36.1
 
diff --git a/recipes-wifi/linux-mac80211/files/patches/subsys/99900-mac80211-mtk-mask-kernel-version-limitation-and-fil.patch b/recipes-wifi/linux-mac80211/files/patches/subsys/99900-mac80211-mtk-mask-kernel-version-limitation-and-fil.patch
index a2d862c..c4ba377 100644
--- a/recipes-wifi/linux-mac80211/files/patches/subsys/99900-mac80211-mtk-mask-kernel-version-limitation-and-fil.patch
+++ b/recipes-wifi/linux-mac80211/files/patches/subsys/99900-mac80211-mtk-mask-kernel-version-limitation-and-fil.patch
@@ -1,4 +1,4 @@
-From d364b3a664a76fdb9b0e95e84e092d41d4f2ddd5 Mon Sep 17 00:00:00 2001
+From ca4f5d6f511a8be9c0cec151c2ccd25bf7aa367c Mon Sep 17 00:00:00 2001
 From: Sujuan Chen <sujuan.chen@mediatek.com>
 Date: Fri, 11 Mar 2022 11:34:11 +0800
 Subject: [PATCH 99900/99901] mac80211: mtk: mask kernel version limitation and
@@ -13,10 +13,10 @@
  4 files changed, 10 deletions(-)
 
 diff --git a/include/net/mac80211.h b/include/net/mac80211.h
-index 66fedf6..95e5e66 100644
+index 4539610..df30f24 100644
 --- a/include/net/mac80211.h
 +++ b/include/net/mac80211.h
-@@ -4292,13 +4292,11 @@ struct ieee80211_ops {
+@@ -4299,13 +4299,11 @@ struct ieee80211_ops {
  				     struct ieee80211_sta *sta, u8 flowid);
  	int (*set_radar_background)(struct ieee80211_hw *hw,
  				    struct cfg80211_chan_def *chandef);
@@ -50,7 +50,7 @@
  
  #endif /* __MAC80211_DRIVER_OPS */
 diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
-index 717dfda..455791f 100644
+index d314f39..9c2490d 100644
 --- a/net/mac80211/iface.c
 +++ b/net/mac80211/iface.c
 @@ -852,7 +852,6 @@ static const struct net_device_ops ieee80211_monitorif_ops = {
diff --git a/recipes-wifi/linux-mac80211/files/patches/subsys/99901-mac80211-mtk-add-fill-receive-path-ops-to-get-wed-i.patch b/recipes-wifi/linux-mac80211/files/patches/subsys/99901-mac80211-mtk-add-fill-receive-path-ops-to-get-wed-i.patch
index 6d58e48..91cf241 100644
--- a/recipes-wifi/linux-mac80211/files/patches/subsys/99901-mac80211-mtk-add-fill-receive-path-ops-to-get-wed-i.patch
+++ b/recipes-wifi/linux-mac80211/files/patches/subsys/99901-mac80211-mtk-add-fill-receive-path-ops-to-get-wed-i.patch
@@ -1,4 +1,4 @@
-From f1d42518adad5791f668a46d3cad3a5efc5f0a30 Mon Sep 17 00:00:00 2001
+From 79cba5aeda7ecbd30a0fc65d3d1083013c11954b Mon Sep 17 00:00:00 2001
 From: Sujuan Chen <sujuan.chen@mediatek.com>
 Date: Wed, 18 May 2022 15:10:22 +0800
 Subject: [PATCH 99901/99901] mac80211: mtk: add fill receive path ops to get
@@ -17,7 +17,7 @@
 diff --git a/include/net/mac80211.h b/include/net/mac80211.h
 old mode 100644
 new mode 100755
-index 95e5e66..9a38b9f
+index df30f24..bf4469b
 --- a/include/net/mac80211.h
 +++ b/include/net/mac80211.h
 @@ -1796,6 +1796,13 @@ struct ieee80211_vif *wdev_to_ieee80211_vif(struct wireless_dev *wdev);
@@ -34,7 +34,7 @@
  /**
   * enum ieee80211_key_flags - key flags
   *
-@@ -3962,6 +3969,8 @@ struct ieee80211_prep_tx_info {
+@@ -3969,6 +3976,8 @@ struct ieee80211_prep_tx_info {
   *	disable background CAC/radar detection.
   * @net_fill_forward_path: Called from .ndo_fill_forward_path in order to
   *	resolve a path for hardware flow offloading
@@ -43,7 +43,7 @@
   */
  struct ieee80211_ops {
  	void (*tx)(struct ieee80211_hw *hw,
-@@ -4297,6 +4306,9 @@ struct ieee80211_ops {
+@@ -4304,6 +4313,9 @@ struct ieee80211_ops {
  				     struct ieee80211_sta *sta,
  				     struct net_device_path_ctx *ctx,
  				     struct net_device_path *path);
@@ -76,7 +76,7 @@
 +
  #endif /* __MAC80211_DRIVER_OPS */
 diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
-index 455791f..98b2369 100644
+index 9c2490d..35f1233 100644
 --- a/net/mac80211/iface.c
 +++ b/net/mac80211/iface.c
 @@ -910,6 +910,29 @@ out:
diff --git a/recipes-wifi/linux-mac80211/files/patches/subsys/subsys.inc b/recipes-wifi/linux-mac80211/files/patches/subsys/subsys.inc
index 35cdbc6..5bdb454 100644
--- a/recipes-wifi/linux-mac80211/files/patches/subsys/subsys.inc
+++ b/recipes-wifi/linux-mac80211/files/patches/subsys/subsys.inc
@@ -62,7 +62,7 @@
     file://910-mac80211-mtk-Set-TWT-Information-Frame-Disabled-bit-.patch \
     file://911-mac80211-mtk-fix-the-issue-of-AP-and-STA-starting-on.patch \
     file://912-mac80211-mtk-check-the-control-channel-before-downgr.patch \
-    file://912-mac80211-mtk-fix-tx-amsdu-aggregation.patch \
+    file://913-mac80211-mtk-fix-tx-amsdu-aggregation.patch \
     file://99900-mac80211-mtk-mask-kernel-version-limitation-and-fil.patch \
     file://99901-mac80211-mtk-add-fill-receive-path-ops-to-get-wed-i.patch \
     "