diff --git a/package/kernel/mt76/patches/001-Revert-sync-with-upstream.patch b/package/kernel/mt76/patches/001-Revert-sync-with-upstream.patch
index d23dd80489d778..3fe394c70c815b 100644
--- a/package/kernel/mt76/patches/001-Revert-sync-with-upstream.patch
+++ b/package/kernel/mt76/patches/001-Revert-sync-with-upstream.patch
@@ -42,8 +42,6 @@ This reverts commit ec46d7486ab91786fbfe77edd306911b7c543334.
  usb.c             |   2 +-
  35 files changed, 204 insertions(+), 250 deletions(-)
 
-diff --git a/debugfs.c b/debugfs.c
-index 79064a4d..895a1376 100644
 --- a/debugfs.c
 +++ b/debugfs.c
 @@ -25,32 +25,6 @@ mt76_reg_get(void *data, u64 *val)
@@ -79,7 +77,7 @@ index 79064a4d..895a1376 100644
  int mt76_queues_read(struct seq_file *s, void *data)
  {
  	struct mt76_dev *dev = dev_get_drvdata(s->private);
-@@ -116,8 +90,6 @@ mt76_register_debugfs_fops(struct mt76_phy *phy,
+@@ -116,8 +90,6 @@ mt76_register_debugfs_fops(struct mt76_p
  	debugfs_create_bool("led_active_low", 0600, dir, &phy->leds.al);
  	debugfs_create_u32("regidx", 0600, dir, &dev->debugfs_reg);
  	debugfs_create_file_unsafe("regval", 0600, dir, dev, fops);
@@ -88,11 +86,9 @@ index 79064a4d..895a1376 100644
  	debugfs_create_blob("eeprom", 0400, dir, &dev->eeprom);
  	if (dev->otp.data)
  		debugfs_create_blob("otp", 0400, dir, &dev->otp);
-diff --git a/dma.c b/dma.c
-index fc24b353..db8b6623 100644
 --- a/dma.c
 +++ b/dma.c
-@@ -890,7 +890,7 @@ mt76_dma_init(struct mt76_dev *dev,
+@@ -910,7 +910,7 @@ mt76_dma_init(struct mt76_dev *dev,
  	dev->napi_dev.threaded = 1;
  
  	mt76_for_each_q_rx(dev, i) {
@@ -101,8 +97,6 @@ index fc24b353..db8b6623 100644
  		mt76_dma_rx_fill(dev, &dev->q_rx[i]);
  		napi_enable(&dev->napi[i]);
  	}
-diff --git a/eeprom.c b/eeprom.c
-index 0a88048b..25f67760 100644
 --- a/eeprom.c
 +++ b/eeprom.c
 @@ -106,6 +106,7 @@ void
@@ -113,8 +107,6 @@ index 0a88048b..25f67760 100644
  	struct device_node *np = dev->dev->of_node;
  
  	of_get_mac_address(np, phy->macaddr);
-diff --git a/mac80211.c b/mac80211.c
-index 7fe7f68a..7c6bc5f3 100644
 --- a/mac80211.c
 +++ b/mac80211.c
 @@ -1496,7 +1496,7 @@ EXPORT_SYMBOL_GPL(mt76_get_sar_power);
@@ -126,7 +118,7 @@ index 7fe7f68a..7c6bc5f3 100644
  		ieee80211_csa_finish(vif);
  }
  
-@@ -1518,7 +1518,7 @@ __mt76_csa_check(void *priv, u8 *mac, struct ieee80211_vif *vif)
+@@ -1518,7 +1518,7 @@ __mt76_csa_check(void *priv, u8 *mac, st
  {
  	struct mt76_dev *dev = priv;
  
@@ -135,11 +127,9 @@ index 7fe7f68a..7c6bc5f3 100644
  		return;
  
  	dev->csa_complete |= ieee80211_beacon_cntdwn_is_complete(vif);
-diff --git a/mt7603/beacon.c b/mt7603/beacon.c
-index b65b0a88..5807cf2c 100644
 --- a/mt7603/beacon.c
 +++ b/mt7603/beacon.c
-@@ -20,7 +20,7 @@ mt7603_update_beacon_iter(void *priv, u8 *mac, struct ieee80211_vif *vif)
+@@ -20,7 +20,7 @@ mt7603_update_beacon_iter(void *priv, u8
  	if (!(mdev->beacon_mask & BIT(mvif->idx)))
  		return;
  
@@ -148,11 +138,9 @@ index b65b0a88..5807cf2c 100644
  	if (!skb)
  		return;
  
-diff --git a/mt7603/dma.c b/mt7603/dma.c
-index 03ba11a6..06a9e6ec 100644
 --- a/mt7603/dma.c
 +++ b/mt7603/dma.c
-@@ -223,8 +223,8 @@ int mt7603_dma_init(struct mt7603_dev *dev)
+@@ -223,8 +223,8 @@ int mt7603_dma_init(struct mt7603_dev *d
  	if (ret)
  		return ret;
  
@@ -163,11 +151,9 @@ index 03ba11a6..06a9e6ec 100644
  	napi_enable(&dev->mt76.tx_napi);
  
  	return 0;
-diff --git a/mt7603/mac.c b/mt7603/mac.c
-index 70a7f84a..b025e355 100644
 --- a/mt7603/mac.c
 +++ b/mt7603/mac.c
-@@ -326,21 +326,19 @@ void mt7603_wtbl_update_cap(struct mt7603_dev *dev, struct ieee80211_sta *sta)
+@@ -326,21 +326,19 @@ void mt7603_wtbl_update_cap(struct mt760
  
  	addr = mt7603_wtbl1_addr(idx);
  
@@ -194,7 +180,7 @@ index 70a7f84a..b025e355 100644
  		val |= MT_WTBL1_W2_VHT;
  
  	mt76_wr(dev, addr + 2 * 4, val);
-@@ -349,9 +347,9 @@ void mt7603_wtbl_update_cap(struct mt7603_dev *dev, struct ieee80211_sta *sta)
+@@ -349,9 +347,9 @@ void mt7603_wtbl_update_cap(struct mt760
  	val = mt76_rr(dev, addr + 9 * 4);
  	val &= ~(MT_WTBL2_W9_SHORT_GI_20 | MT_WTBL2_W9_SHORT_GI_40 |
  		 MT_WTBL2_W9_SHORT_GI_80);
@@ -206,11 +192,9 @@ index 70a7f84a..b025e355 100644
  		val |= MT_WTBL2_W9_SHORT_GI_40;
  	mt76_wr(dev, addr + 9 * 4, val);
  }
-diff --git a/mt7603/main.c b/mt7603/main.c
-index ca50feb0..91425b45 100644
 --- a/mt7603/main.c
 +++ b/mt7603/main.c
-@@ -297,7 +297,7 @@ mt7603_configure_filter(struct ieee80211_hw *hw, unsigned int changed_flags,
+@@ -297,7 +297,7 @@ mt7603_configure_filter(struct ieee80211
  
  static void
  mt7603_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
@@ -219,7 +203,7 @@ index ca50feb0..91425b45 100644
  {
  	struct mt7603_dev *dev = hw->priv;
  	struct mt7603_vif *mvif = (struct mt7603_vif *)vif->drv_priv;
-@@ -305,7 +305,7 @@ mt7603_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
+@@ -305,7 +305,7 @@ mt7603_bss_info_changed(struct ieee80211
  	mutex_lock(&dev->mt76.mutex);
  
  	if (changed & (BSS_CHANGED_ASSOC | BSS_CHANGED_BSSID)) {
@@ -228,7 +212,7 @@ index ca50feb0..91425b45 100644
  			mt76_wr(dev, MT_BSSID0(mvif->idx),
  				get_unaligned_le32(info->bssid));
  			mt76_wr(dev, MT_BSSID1(mvif->idx),
-@@ -527,8 +527,7 @@ mt7603_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
+@@ -527,8 +527,7 @@ mt7603_set_key(struct ieee80211_hw *hw,
  }
  
  static int
@@ -238,7 +222,7 @@ index ca50feb0..91425b45 100644
  	       const struct ieee80211_tx_queue_params *params)
  {
  	struct mt7603_dev *dev = hw->priv;
-@@ -658,7 +657,7 @@ mt7603_sta_rate_tbl_update(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
+@@ -658,7 +657,7 @@ mt7603_sta_rate_tbl_update(struct ieee80
  	mt7603_wtbl_set_rates(dev, msta, NULL, msta->rates);
  	msta->rate_probe = false;
  	mt7603_wtbl_set_smps(dev, msta,
@@ -247,11 +231,9 @@ index ca50feb0..91425b45 100644
  	spin_unlock_bh(&dev->mt76.lock);
  }
  
-diff --git a/mt7615/dma.c b/mt7615/dma.c
-index f1914431..ec729dbe 100644
 --- a/mt7615/dma.c
 +++ b/mt7615/dma.c
-@@ -281,8 +281,8 @@ int mt7615_dma_init(struct mt7615_dev *dev)
+@@ -281,8 +281,8 @@ int mt7615_dma_init(struct mt7615_dev *d
  	if (ret < 0)
  		return ret;
  
@@ -262,11 +244,9 @@ index f1914431..ec729dbe 100644
  	napi_enable(&dev->mt76.tx_napi);
  
  	mt76_poll(dev, MT_WPDMA_GLO_CFG,
-diff --git a/mt7615/main.c b/mt7615/main.c
-index ab4c1b44..0d80003c 100644
 --- a/mt7615/main.c
 +++ b/mt7615/main.c
-@@ -473,8 +473,7 @@ static int mt7615_config(struct ieee80211_hw *hw, u32 changed)
+@@ -473,8 +473,7 @@ static int mt7615_config(struct ieee8021
  }
  
  static int
@@ -276,7 +256,7 @@ index ab4c1b44..0d80003c 100644
  	       const struct ieee80211_tx_queue_params *params)
  {
  	struct mt76_vif *mvif = (struct mt76_vif *)vif->drv_priv;
-@@ -556,7 +555,7 @@ static void mt7615_configure_filter(struct ieee80211_hw *hw,
+@@ -556,7 +555,7 @@ static void mt7615_configure_filter(stru
  static void mt7615_bss_info_changed(struct ieee80211_hw *hw,
  				    struct ieee80211_vif *vif,
  				    struct ieee80211_bss_conf *info,
@@ -285,7 +265,7 @@ index ab4c1b44..0d80003c 100644
  {
  	struct mt7615_dev *dev = mt7615_hw_dev(hw);
  	struct mt7615_phy *phy = mt7615_hw_phy(hw);
-@@ -599,7 +598,7 @@ static void mt7615_bss_info_changed(struct ieee80211_hw *hw,
+@@ -599,7 +598,7 @@ static void mt7615_bss_info_changed(stru
  	}
  
  	if (changed & BSS_CHANGED_ASSOC)
@@ -294,8 +274,6 @@ index ab4c1b44..0d80003c 100644
  
  	mt7615_mutex_release(dev);
  }
-diff --git a/mt7615/mcu.c b/mt7615/mcu.c
-index 83f30305..81579a14 100644
 --- a/mt7615/mcu.c
 +++ b/mt7615/mcu.c
 @@ -352,7 +352,7 @@ out:
@@ -307,7 +285,7 @@ index 83f30305..81579a14 100644
  		ieee80211_csa_finish(vif);
  }
  
-@@ -698,7 +698,7 @@ mt7615_mcu_add_beacon_offload(struct mt7615_dev *dev,
+@@ -698,7 +698,7 @@ mt7615_mcu_add_beacon_offload(struct mt7
  	if (!enable)
  		goto out;
  
@@ -316,7 +294,7 @@ index 83f30305..81579a14 100644
  	if (!skb)
  		return -EINVAL;
  
-@@ -1073,7 +1073,7 @@ mt7615_mcu_uni_add_beacon_offload(struct mt7615_dev *dev,
+@@ -1073,7 +1073,7 @@ mt7615_mcu_uni_add_beacon_offload(struct
  	if (!enable)
  		goto out;
  
@@ -325,7 +303,7 @@ index 83f30305..81579a14 100644
  	if (!skb)
  		return -EINVAL;
  
-@@ -2525,7 +2525,7 @@ int mt7615_mcu_set_bss_pm(struct mt7615_dev *dev, struct ieee80211_vif *vif,
+@@ -2525,7 +2525,7 @@ int mt7615_mcu_set_bss_pm(struct mt7615_
  		u8 pad;
  	} req = {
  		.bss_idx = mvif->mt76.idx,
@@ -334,11 +312,9 @@ index 83f30305..81579a14 100644
  		.dtim_period = vif->bss_conf.dtim_period,
  		.bcn_interval = cpu_to_le16(vif->bss_conf.beacon_int),
  	};
-diff --git a/mt7615/soc.c b/mt7615/soc.c
-index f13d1b41..be9a69fe 100644
 --- a/mt7615/soc.c
 +++ b/mt7615/soc.c
-@@ -31,6 +31,7 @@ int mt7622_wmac_init(struct mt7615_dev *dev)
+@@ -31,6 +31,7 @@ int mt7622_wmac_init(struct mt7615_dev *
  
  static int mt7622_wmac_probe(struct platform_device *pdev)
  {
@@ -346,7 +322,7 @@ index f13d1b41..be9a69fe 100644
  	void __iomem *mem_base;
  	int irq;
  
-@@ -38,7 +39,7 @@ static int mt7622_wmac_probe(struct platform_device *pdev)
+@@ -38,7 +39,7 @@ static int mt7622_wmac_probe(struct plat
  	if (irq < 0)
  		return irq;
  
@@ -355,11 +331,9 @@ index f13d1b41..be9a69fe 100644
  	if (IS_ERR(mem_base))
  		return PTR_ERR(mem_base);
  
-diff --git a/mt76_connac_mcu.c b/mt76_connac_mcu.c
-index 5a047e63..b6ad54fe 100644
 --- a/mt76_connac_mcu.c
 +++ b/mt76_connac_mcu.c
-@@ -196,7 +196,7 @@ int mt76_connac_mcu_set_vif_ps(struct mt76_dev *dev, struct ieee80211_vif *vif)
+@@ -196,7 +196,7 @@ int mt76_connac_mcu_set_vif_ps(struct mt
  			      */
  	} req = {
  		.bss_idx = mvif->idx,
@@ -368,7 +342,7 @@ index 5a047e63..b6ad54fe 100644
  	};
  
  	if (vif->type != NL80211_IFTYPE_STATION)
-@@ -407,7 +407,7 @@ void mt76_connac_mcu_sta_basic_tlv(struct sk_buff *skb,
+@@ -407,7 +407,7 @@ void mt76_connac_mcu_sta_basic_tlv(struc
  		else
  			conn_type = CONNECTION_INFRA_AP;
  		basic->conn_type = cpu_to_le32(conn_type);
@@ -377,7 +351,7 @@ index 5a047e63..b6ad54fe 100644
  		break;
  	case NL80211_IFTYPE_ADHOC:
  		basic->conn_type = cpu_to_le32(CONNECTION_IBSS_ADHOC);
-@@ -551,7 +551,7 @@ void mt76_connac_mcu_wtbl_generic_tlv(struct mt76_dev *dev,
+@@ -551,7 +551,7 @@ void mt76_connac_mcu_wtbl_generic_tlv(st
  
  	if (sta) {
  		if (vif->type == NL80211_IFTYPE_STATION)
@@ -386,7 +360,7 @@ index 5a047e63..b6ad54fe 100644
  		else
  			generic->partial_aid = cpu_to_le16(sta->aid);
  		memcpy(generic->peer_addr, sta->addr, ETH_ALEN);
-@@ -597,14 +597,14 @@ mt76_connac_mcu_sta_amsdu_tlv(struct sk_buff *skb, struct ieee80211_sta *sta,
+@@ -597,14 +597,14 @@ mt76_connac_mcu_sta_amsdu_tlv(struct sk_
  	    vif->type != NL80211_IFTYPE_STATION)
  		return;
  
@@ -403,7 +377,7 @@ index 5a047e63..b6ad54fe 100644
  			       IEEE80211_MAX_MPDU_LEN_VHT_7991;
  
  	wcid->amsdu = true;
-@@ -615,7 +615,7 @@ mt76_connac_mcu_sta_amsdu_tlv(struct sk_buff *skb, struct ieee80211_sta *sta,
+@@ -615,7 +615,7 @@ mt76_connac_mcu_sta_amsdu_tlv(struct sk_
  static void
  mt76_connac_mcu_sta_he_tlv(struct sk_buff *skb, struct ieee80211_sta *sta)
  {
@@ -412,7 +386,7 @@ index 5a047e63..b6ad54fe 100644
  	struct ieee80211_he_cap_elem *elem = &he_cap->he_cap_elem;
  	struct sta_rec_he *he;
  	struct tlv *tlv;
-@@ -703,7 +703,7 @@ mt76_connac_mcu_sta_he_tlv(struct sk_buff *skb, struct ieee80211_sta *sta)
+@@ -703,7 +703,7 @@ mt76_connac_mcu_sta_he_tlv(struct sk_buf
  
  	he->he_cap = cpu_to_le32(cap);
  
@@ -421,7 +395,7 @@ index 5a047e63..b6ad54fe 100644
  	case IEEE80211_STA_RX_BW_160:
  		if (elem->phy_cap_info[0] &
  		    IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_80PLUS80_MHZ_IN_5G)
-@@ -788,9 +788,9 @@ mt76_connac_get_phy_mode_v2(struct mt76_phy *mphy, struct ieee80211_vif *vif,
+@@ -788,9 +788,9 @@ mt76_connac_get_phy_mode_v2(struct mt76_
  	u8 mode = 0;
  
  	if (sta) {
@@ -434,7 +408,7 @@ index 5a047e63..b6ad54fe 100644
  	} else {
  		struct ieee80211_supported_band *sband;
  
-@@ -839,25 +839,25 @@ void mt76_connac_mcu_sta_tlv(struct mt76_phy *mphy, struct sk_buff *skb,
+@@ -839,25 +839,25 @@ void mt76_connac_mcu_sta_tlv(struct mt76
  	u16 supp_rates;
  
  	/* starec ht */
@@ -466,7 +440,7 @@ index 5a047e63..b6ad54fe 100644
  	}
  
  	/* starec uapsd */
-@@ -866,11 +866,11 @@ void mt76_connac_mcu_sta_tlv(struct mt76_phy *mphy, struct sk_buff *skb,
+@@ -866,11 +866,11 @@ void mt76_connac_mcu_sta_tlv(struct mt76
  	if (!is_mt7921(dev))
  		return;
  
@@ -480,7 +454,7 @@ index 5a047e63..b6ad54fe 100644
  		mt76_connac_mcu_sta_he_tlv(skb, sta);
  		mt76_connac_mcu_sta_he_tlv_v2(skb, sta);
  		if (band == NL80211_BAND_6GHZ &&
-@@ -880,7 +880,7 @@ void mt76_connac_mcu_sta_tlv(struct mt76_phy *mphy, struct sk_buff *skb,
+@@ -880,7 +880,7 @@ void mt76_connac_mcu_sta_tlv(struct mt76
  			tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_HE_6G,
  						      sizeof(*he_6g_capa));
  			he_6g_capa = (struct sta_rec_he_6g_capa *)tlv;
@@ -489,7 +463,7 @@ index 5a047e63..b6ad54fe 100644
  		}
  	}
  
-@@ -890,14 +890,14 @@ void mt76_connac_mcu_sta_tlv(struct mt76_phy *mphy, struct sk_buff *skb,
+@@ -890,14 +890,14 @@ void mt76_connac_mcu_sta_tlv(struct mt76
  	phy->basic_rate = cpu_to_le16((u16)vif->bss_conf.basic_rates);
  	phy->rcpi = rcpi;
  	phy->ampdu = FIELD_PREP(IEEE80211_HT_AMPDU_PARM_FACTOR,
@@ -507,7 +481,7 @@ index 5a047e63..b6ad54fe 100644
  	if (band == NL80211_BAND_2GHZ)
  		supp_rates = FIELD_PREP(RA_LEGACY_OFDM, supp_rates >> 4) |
  			     FIELD_PREP(RA_LEGACY_CCK, supp_rates & 0xf);
-@@ -906,18 +906,17 @@ void mt76_connac_mcu_sta_tlv(struct mt76_phy *mphy, struct sk_buff *skb,
+@@ -906,18 +906,17 @@ void mt76_connac_mcu_sta_tlv(struct mt76
  
  	ra_info->legacy = cpu_to_le16(supp_rates);
  
@@ -531,7 +505,7 @@ index 5a047e63..b6ad54fe 100644
  			IEEE80211_OPMODE_NOTIF_RX_NSS_SHIFT;
  	}
  }
-@@ -933,7 +932,7 @@ void mt76_connac_mcu_wtbl_smps_tlv(struct sk_buff *skb,
+@@ -933,7 +932,7 @@ void mt76_connac_mcu_wtbl_smps_tlv(struc
  	tlv = mt76_connac_mcu_add_nested_tlv(skb, WTBL_SMPS, sizeof(*smps),
  					     wtbl_tlv, sta_wtbl);
  	smps = (struct wtbl_smps *)tlv;
@@ -540,7 +514,7 @@ index 5a047e63..b6ad54fe 100644
  }
  EXPORT_SYMBOL_GPL(mt76_connac_mcu_wtbl_smps_tlv);
  
-@@ -945,27 +944,27 @@ void mt76_connac_mcu_wtbl_ht_tlv(struct mt76_dev *dev, struct sk_buff *skb,
+@@ -945,27 +944,27 @@ void mt76_connac_mcu_wtbl_ht_tlv(struct
  	struct tlv *tlv;
  	u32 flags = 0;
  
@@ -576,7 +550,7 @@ index 5a047e63..b6ad54fe 100644
  		struct wtbl_vht *vht;
  		u8 af;
  
-@@ -974,18 +973,18 @@ void mt76_connac_mcu_wtbl_ht_tlv(struct mt76_dev *dev, struct sk_buff *skb,
+@@ -974,18 +973,18 @@ void mt76_connac_mcu_wtbl_ht_tlv(struct
  						     sta_wtbl);
  		vht = (struct wtbl_vht *)tlv;
  		vht->ldpc = vht_ldpc &&
@@ -598,7 +572,7 @@ index 5a047e63..b6ad54fe 100644
  		/* sgi */
  		u32 msk = MT_WTBL_W5_SHORT_GI_20 | MT_WTBL_W5_SHORT_GI_40 |
  			  MT_WTBL_W5_SHORT_GI_80 | MT_WTBL_W5_SHORT_GI_160;
-@@ -995,15 +994,15 @@ void mt76_connac_mcu_wtbl_ht_tlv(struct mt76_dev *dev, struct sk_buff *skb,
+@@ -995,15 +994,15 @@ void mt76_connac_mcu_wtbl_ht_tlv(struct
  						     sizeof(*raw), wtbl_tlv,
  						     sta_wtbl);
  
@@ -619,7 +593,7 @@ index 5a047e63..b6ad54fe 100644
  				flags |= MT_WTBL_W5_SHORT_GI_160;
  		}
  		raw = (struct wtbl_raw *)tlv;
-@@ -1289,9 +1288,9 @@ u8 mt76_connac_get_phy_mode(struct mt76_phy *phy, struct ieee80211_vif *vif,
+@@ -1289,9 +1288,9 @@ u8 mt76_connac_get_phy_mode(struct mt76_
  		return 0x38;
  
  	if (sta) {
@@ -632,7 +606,7 @@ index 5a047e63..b6ad54fe 100644
  	} else {
  		struct ieee80211_supported_band *sband;
  
-@@ -2231,10 +2230,8 @@ int mt76_connac_mcu_update_arp_filter(struct mt76_dev *dev,
+@@ -2231,10 +2230,8 @@ int mt76_connac_mcu_update_arp_filter(st
  				      struct mt76_vif *vif,
  				      struct ieee80211_bss_conf *info)
  {
@@ -644,7 +618,7 @@ index 5a047e63..b6ad54fe 100644
  			   IEEE80211_BSS_ARP_ADDR_LIST_LEN);
  	struct {
  		struct {
-@@ -2262,7 +2259,7 @@ int mt76_connac_mcu_update_arp_filter(struct mt76_dev *dev,
+@@ -2262,7 +2259,7 @@ int mt76_connac_mcu_update_arp_filter(st
  
  	skb_put_data(skb, &req_hdr, sizeof(req_hdr));
  	for (i = 0; i < len; i++)
@@ -653,11 +627,9 @@ index 5a047e63..b6ad54fe 100644
  
  	return mt76_mcu_skb_send_msg(dev, skb, MCU_UNI_CMD(OFFLOAD), true);
  }
-diff --git a/mt76x02.h b/mt76x02.h
-index 4cd63bac..3f2a9b7f 100644
 --- a/mt76x02.h
 +++ b/mt76x02.h
-@@ -170,8 +170,7 @@ int mt76x02_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
+@@ -170,8 +170,7 @@ int mt76x02_set_key(struct ieee80211_hw
  		    struct ieee80211_vif *vif, struct ieee80211_sta *sta,
  		    struct ieee80211_key_conf *key);
  int mt76x02_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
@@ -667,7 +639,7 @@ index 4cd63bac..3f2a9b7f 100644
  void mt76x02_sta_rate_tbl_update(struct ieee80211_hw *hw,
  				 struct ieee80211_vif *vif,
  				 struct ieee80211_sta *sta);
-@@ -202,7 +201,7 @@ void mt76x02_sw_scan_complete(struct ieee80211_hw *hw,
+@@ -202,7 +201,7 @@ void mt76x02_sw_scan_complete(struct iee
  void mt76x02_sta_ps(struct mt76_dev *dev, struct ieee80211_sta *sta, bool ps);
  void mt76x02_bss_info_changed(struct ieee80211_hw *hw,
  			      struct ieee80211_vif *vif,
@@ -676,11 +648,9 @@ index 4cd63bac..3f2a9b7f 100644
  void mt76x02_reconfig_complete(struct ieee80211_hw *hw,
  			       enum ieee80211_reconfig_type reconfig_type);
  
-diff --git a/mt76x02_beacon.c b/mt76x02_beacon.c
-index ad4dc8e1..67844e2e 100644
 --- a/mt76x02_beacon.c
 +++ b/mt76x02_beacon.c
-@@ -143,7 +143,7 @@ mt76x02_update_beacon_iter(void *priv, u8 *mac, struct ieee80211_vif *vif)
+@@ -143,7 +143,7 @@ mt76x02_update_beacon_iter(void *priv, u
  	if (!(dev->mt76.beacon_mask & BIT(mvif->idx)))
  		return;
  
@@ -689,11 +659,9 @@ index ad4dc8e1..67844e2e 100644
  	if (!skb)
  		return;
  
-diff --git a/mt76x02_mac.c b/mt76x02_mac.c
-index d3f74473..87ea3db1 100644
 --- a/mt76x02_mac.c
 +++ b/mt76x02_mac.c
-@@ -404,7 +404,7 @@ void mt76x02_mac_write_txwi(struct mt76x02_dev *dev, struct mt76x02_txwi *txwi,
+@@ -404,7 +404,7 @@ void mt76x02_mac_write_txwi(struct mt76x
  		txwi->rate |= cpu_to_le16(MT_RXWI_RATE_LDPC);
  	if ((info->flags & IEEE80211_TX_CTL_STBC) && nss == 1)
  		txwi->rate |= cpu_to_le16(MT_RXWI_RATE_STBC);
@@ -702,7 +670,7 @@ index d3f74473..87ea3db1 100644
  		txwi_flags |= MT_TXWI_FLAGS_MMPS;
  	if (!(info->flags & IEEE80211_TX_CTL_NO_ACK))
  		txwi->ack_ctl |= MT_TXWI_ACK_CTL_REQ;
-@@ -412,9 +412,9 @@ void mt76x02_mac_write_txwi(struct mt76x02_dev *dev, struct mt76x02_txwi *txwi,
+@@ -412,9 +412,9 @@ void mt76x02_mac_write_txwi(struct mt76x
  		txwi->ack_ctl |= MT_TXWI_ACK_CTL_NSEQ;
  	if ((info->flags & IEEE80211_TX_CTL_AMPDU) && sta) {
  		u8 ba_size = IEEE80211_MIN_AMPDU_BUF;
@@ -714,11 +682,9 @@ index d3f74473..87ea3db1 100644
  		ba_size = min_t(int, 63, ba_size - 1);
  		if (info->flags & IEEE80211_TX_CTL_RATE_CTRL_PROBE)
  			ba_size = 0;
-diff --git a/mt76x02_mmio.c b/mt76x02_mmio.c
-index e9c5e85e..648f4ab9 100644
 --- a/mt76x02_mmio.c
 +++ b/mt76x02_mmio.c
-@@ -231,8 +231,8 @@ int mt76x02_dma_init(struct mt76x02_dev *dev)
+@@ -231,8 +231,8 @@ int mt76x02_dma_init(struct mt76x02_dev
  	if (ret)
  		return ret;
  
@@ -729,11 +695,9 @@ index e9c5e85e..648f4ab9 100644
  	napi_enable(&dev->mt76.tx_napi);
  
  	return 0;
-diff --git a/mt76x02_util.c b/mt76x02_util.c
-index 7451a632..f9315c7e 100644
 --- a/mt76x02_util.c
 +++ b/mt76x02_util.c
-@@ -486,8 +486,7 @@ int mt76x02_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
+@@ -486,8 +486,7 @@ int mt76x02_set_key(struct ieee80211_hw
  EXPORT_SYMBOL_GPL(mt76x02_set_key);
  
  int mt76x02_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
@@ -752,11 +716,9 @@ index 7451a632..f9315c7e 100644
  {
  	struct mt76x02_vif *mvif = (struct mt76x02_vif *)vif->drv_priv;
  	struct mt76x02_dev *dev = hw->priv;
-diff --git a/mt76x2/pci.c b/mt76x2/pci.c
-index df85ebc6..8a22ee58 100644
 --- a/mt76x2/pci.c
 +++ b/mt76x2/pci.c
-@@ -80,7 +80,7 @@ mt76x2e_probe(struct pci_dev *pdev, const struct pci_device_id *id)
+@@ -80,7 +80,7 @@ mt76x2e_probe(struct pci_dev *pdev, cons
  	mt76_rmw_field(dev, 0x15a10, 0x1f << 16, 0x9);
  
  	/* RG_SSUSB_G1_CDR_BIC_LTR = 0xf */
@@ -765,8 +727,6 @@ index df85ebc6..8a22ee58 100644
  
  	/* RG_SSUSB_CDR_BR_PE1D = 0x3 */
  	mt76_rmw_field(dev, 0x15c58, 0x3 << 6, 0x3);
-diff --git a/mt7915/Kconfig b/mt7915/Kconfig
-index d710726d..32001254 100644
 --- a/mt7915/Kconfig
 +++ b/mt7915/Kconfig
 @@ -5,7 +5,6 @@ config MT7915E
@@ -777,11 +737,9 @@ index d710726d..32001254 100644
  	help
  	  This adds support for MT7915-based wireless PCIe devices,
  	  which support concurrent dual-band operation at both 5GHz
-diff --git a/mt7915/debugfs.c b/mt7915/debugfs.c
-index 5a46813a..6cb7c16b 100644
 --- a/mt7915/debugfs.c
 +++ b/mt7915/debugfs.c
-@@ -1364,8 +1364,8 @@ static ssize_t mt7915_sta_fixed_rate_set(struct file *file,
+@@ -1364,8 +1364,8 @@ static ssize_t mt7915_sta_fixed_rate_set
  
  	phy.ldpc = (phy.bw || phy.ldpc) * GENMASK(2, 0);
  	for (i = 0; i <= phy.bw; i++) {
@@ -792,11 +750,9 @@ index 5a46813a..6cb7c16b 100644
  	}
  	field = RATE_PARAM_FIXED;
  
-diff --git a/mt7915/dma.c b/mt7915/dma.c
-index e3fa0649..0ca68d4a 100644
 --- a/mt7915/dma.c
 +++ b/mt7915/dma.c
-@@ -550,8 +550,8 @@ int mt7915_dma_init(struct mt7915_dev *dev, struct mt7915_phy *phy2)
+@@ -550,8 +550,8 @@ int mt7915_dma_init(struct mt7915_dev *d
  	if (ret < 0)
  		return ret;
  
@@ -807,11 +763,9 @@ index e3fa0649..0ca68d4a 100644
  	napi_enable(&dev->mt76.tx_napi);
  
  	mt7915_dma_enable(dev);
-diff --git a/mt7915/init.c b/mt7915/init.c
-index 6fd5c63e..0a640c7f 100644
 --- a/mt7915/init.c
 +++ b/mt7915/init.c
-@@ -1093,8 +1093,7 @@ mt7915_init_he_caps(struct mt7915_phy *phy, enum nl80211_band band,
+@@ -1093,8 +1093,7 @@ mt7915_init_he_caps(struct mt7915_phy *p
  			mt7915_gen_ppe_thresh(he_cap->ppe_thres, nss);
  		} else {
  			he_cap_elem->phy_cap_info[9] |=
@@ -821,11 +775,9 @@ index 6fd5c63e..0a640c7f 100644
  		}
  
  		if (band == NL80211_BAND_6GHZ) {
-diff --git a/mt7915/mac.c b/mt7915/mac.c
-index f0d5a360..b477e9d9 100644
 --- a/mt7915/mac.c
 +++ b/mt7915/mac.c
-@@ -853,7 +853,7 @@ mt7915_tx_check_aggr(struct ieee80211_sta *sta, __le32 *txwi)
+@@ -853,7 +853,7 @@ mt7915_tx_check_aggr(struct ieee80211_st
  	u16 fc, tid;
  	u32 val;
  
@@ -834,11 +786,9 @@ index f0d5a360..b477e9d9 100644
  		return;
  
  	tid = le32_get_bits(txwi[1], MT_TXD1_TID);
-diff --git a/mt7915/main.c b/mt7915/main.c
-index 0511d6a5..076688d8 100644
 --- a/mt7915/main.c
 +++ b/mt7915/main.c
-@@ -490,8 +490,7 @@ static int mt7915_config(struct ieee80211_hw *hw, u32 changed)
+@@ -490,8 +490,7 @@ static int mt7915_config(struct ieee8021
  }
  
  static int
@@ -848,7 +798,7 @@ index 0511d6a5..076688d8 100644
  	       const struct ieee80211_tx_queue_params *params)
  {
  	struct mt7915_vif *mvif = (struct mt7915_vif *)vif->drv_priv;
-@@ -586,7 +585,7 @@ mt7915_update_bss_color(struct ieee80211_hw *hw,
+@@ -586,7 +585,7 @@ mt7915_update_bss_color(struct ieee80211
  static void mt7915_bss_info_changed(struct ieee80211_hw *hw,
  				    struct ieee80211_vif *vif,
  				    struct ieee80211_bss_conf *info,
@@ -857,7 +807,7 @@ index 0511d6a5..076688d8 100644
  {
  	struct mt7915_phy *phy = mt7915_hw_phy(hw);
  	struct mt7915_dev *dev = mt7915_hw_dev(hw);
-@@ -606,7 +605,7 @@ static void mt7915_bss_info_changed(struct ieee80211_hw *hw,
+@@ -606,7 +605,7 @@ static void mt7915_bss_info_changed(stru
  	}
  
  	if (changed & BSS_CHANGED_ASSOC)
@@ -866,7 +816,7 @@ index 0511d6a5..076688d8 100644
  
  	if (changed & BSS_CHANGED_ERP_CTS_PROT)
  		mt7915_mac_enable_rtscts(dev, vif, info->use_cts_prot);
-@@ -1146,10 +1145,10 @@ static int mt7915_sta_set_txpwr(struct ieee80211_hw *hw,
+@@ -1146,10 +1145,10 @@ static int mt7915_sta_set_txpwr(struct i
  {
  	struct mt7915_phy *phy = mt7915_hw_phy(hw);
  	struct mt7915_dev *dev = mt7915_hw_dev(hw);
@@ -879,11 +829,9 @@ index 0511d6a5..076688d8 100644
  		txpower = 0;
  
  	mutex_lock(&dev->mt76.mutex);
-diff --git a/mt7915/mcu.c b/mt7915/mcu.c
-index 35441dcb..e29fd0b7 100644
 --- a/mt7915/mcu.c
 +++ b/mt7915/mcu.c
-@@ -59,7 +59,7 @@ mt7915_mcu_set_sta_he_mcs(struct ieee80211_sta *sta, __le16 *he_mcs,
+@@ -59,7 +59,7 @@ mt7915_mcu_set_sta_he_mcs(struct ieee802
  	struct mt7915_dev *dev = msta->vif->phy->dev;
  	enum nl80211_band band = msta->vif->phy->mt76->chandef.chan->band;
  	const u16 *mask = msta->vif->bitrate_mask.control[band].he_mcs;
@@ -892,7 +840,7 @@ index 35441dcb..e29fd0b7 100644
  
  	for (nss = 0; nss < max_nss; nss++) {
  		int mcs;
-@@ -99,7 +99,7 @@ mt7915_mcu_set_sta_he_mcs(struct ieee80211_sta *sta, __le16 *he_mcs,
+@@ -99,7 +99,7 @@ mt7915_mcu_set_sta_he_mcs(struct ieee802
  
  		/* only support 2ss on 160MHz for mt7915 */
  		if (is_mt7915(&dev->mt76) && nss > 1 &&
@@ -901,7 +849,7 @@ index 35441dcb..e29fd0b7 100644
  			break;
  	}
  
-@@ -112,8 +112,8 @@ mt7915_mcu_set_sta_vht_mcs(struct ieee80211_sta *sta, __le16 *vht_mcs,
+@@ -112,8 +112,8 @@ mt7915_mcu_set_sta_vht_mcs(struct ieee80
  {
  	struct mt7915_sta *msta = (struct mt7915_sta *)sta->drv_priv;
  	struct mt7915_dev *dev = msta->vif->phy->dev;
@@ -912,7 +860,7 @@ index 35441dcb..e29fd0b7 100644
  	u16 mcs;
  
  	for (nss = 0; nss < max_nss; nss++, mcs_map >>= 2) {
-@@ -135,7 +135,7 @@ mt7915_mcu_set_sta_vht_mcs(struct ieee80211_sta *sta, __le16 *vht_mcs,
+@@ -135,7 +135,7 @@ mt7915_mcu_set_sta_vht_mcs(struct ieee80
  
  		/* only support 2ss on 160MHz for mt7915 */
  		if (is_mt7915(&dev->mt76) && nss > 1 &&
@@ -934,7 +882,7 @@ index 35441dcb..e29fd0b7 100644
  }
  
  static int
-@@ -220,7 +220,7 @@ int mt7915_mcu_wa_cmd(struct mt7915_dev *dev, int cmd, u32 a1, u32 a2, u32 a3)
+@@ -220,7 +220,7 @@ int mt7915_mcu_wa_cmd(struct mt7915_dev
  static void
  mt7915_mcu_csa_finish(void *priv, u8 *mac, struct ieee80211_vif *vif)
  {
@@ -943,7 +891,7 @@ index 35441dcb..e29fd0b7 100644
  		ieee80211_csa_finish(vif);
  }
  
-@@ -321,7 +321,7 @@ mt7915_mcu_rx_log_message(struct mt7915_dev *dev, struct sk_buff *skb)
+@@ -321,7 +321,7 @@ mt7915_mcu_rx_log_message(struct mt7915_
  static void
  mt7915_mcu_cca_finish(void *priv, u8 *mac, struct ieee80211_vif *vif)
  {
@@ -952,7 +900,7 @@ index 35441dcb..e29fd0b7 100644
  		return;
  
  	ieee80211_color_change_finish(vif);
-@@ -707,13 +707,13 @@ mt7915_mcu_sta_he_tlv(struct sk_buff *skb, struct ieee80211_sta *sta,
+@@ -707,13 +707,13 @@ mt7915_mcu_sta_he_tlv(struct sk_buff *sk
  		      struct ieee80211_vif *vif)
  {
  	struct mt7915_vif *mvif = (struct mt7915_vif *)vif->drv_priv;
@@ -968,7 +916,7 @@ index 35441dcb..e29fd0b7 100644
  		return;
  
  	tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_HE, sizeof(*he));
-@@ -799,8 +799,8 @@ mt7915_mcu_sta_he_tlv(struct sk_buff *skb, struct ieee80211_sta *sta,
+@@ -799,8 +799,8 @@ mt7915_mcu_sta_he_tlv(struct sk_buff *sk
  
  	he->he_cap = cpu_to_le32(cap);
  
@@ -979,7 +927,7 @@ index 35441dcb..e29fd0b7 100644
  	case IEEE80211_STA_RX_BW_160:
  		if (elem->phy_cap_info[0] &
  		    IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_80PLUS80_MHZ_IN_5G)
-@@ -850,7 +850,7 @@ mt7915_mcu_sta_muru_tlv(struct mt7915_dev *dev, struct sk_buff *skb,
+@@ -850,7 +850,7 @@ mt7915_mcu_sta_muru_tlv(struct mt7915_de
  			struct ieee80211_sta *sta, struct ieee80211_vif *vif)
  {
  	struct mt7915_vif *mvif = (struct mt7915_vif *)vif->drv_priv;
@@ -988,7 +936,7 @@ index 35441dcb..e29fd0b7 100644
  	struct sta_rec_muru *muru;
  	struct tlv *tlv;
  
-@@ -869,11 +869,11 @@ mt7915_mcu_sta_muru_tlv(struct mt7915_dev *dev, struct sk_buff *skb,
+@@ -869,11 +869,11 @@ mt7915_mcu_sta_muru_tlv(struct mt7915_de
  		muru->cfg.mimo_ul_en = true;
  	muru->cfg.ofdma_dl_en = true;
  
@@ -1003,7 +951,7 @@ index 35441dcb..e29fd0b7 100644
  		return;
  
  	muru->mimo_dl.partial_bw_dl_mimo =
-@@ -907,13 +907,13 @@ mt7915_mcu_sta_ht_tlv(struct sk_buff *skb, struct ieee80211_sta *sta)
+@@ -907,13 +907,13 @@ mt7915_mcu_sta_ht_tlv(struct sk_buff *sk
  	struct sta_rec_ht *ht;
  	struct tlv *tlv;
  
@@ -1019,7 +967,7 @@ index 35441dcb..e29fd0b7 100644
  }
  
  static void
-@@ -922,15 +922,15 @@ mt7915_mcu_sta_vht_tlv(struct sk_buff *skb, struct ieee80211_sta *sta)
+@@ -922,15 +922,15 @@ mt7915_mcu_sta_vht_tlv(struct sk_buff *s
  	struct sta_rec_vht *vht;
  	struct tlv *tlv;
  
@@ -1039,7 +987,7 @@ index 35441dcb..e29fd0b7 100644
  }
  
  static void
-@@ -945,7 +945,7 @@ mt7915_mcu_sta_amsdu_tlv(struct mt7915_dev *dev, struct sk_buff *skb,
+@@ -945,7 +945,7 @@ mt7915_mcu_sta_amsdu_tlv(struct mt7915_d
  	    vif->type != NL80211_IFTYPE_AP)
  		return;
  
@@ -1048,7 +996,7 @@ index 35441dcb..e29fd0b7 100644
  	    return;
  
  	tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_HW_AMSDU, sizeof(*amsdu));
-@@ -954,7 +954,7 @@ mt7915_mcu_sta_amsdu_tlv(struct mt7915_dev *dev, struct sk_buff *skb,
+@@ -954,7 +954,7 @@ mt7915_mcu_sta_amsdu_tlv(struct mt7915_d
  	amsdu->amsdu_en = true;
  	msta->wcid.amsdu = true;
  
@@ -1057,7 +1005,7 @@ index 35441dcb..e29fd0b7 100644
  	case IEEE80211_MAX_MPDU_LEN_VHT_11454:
  		if (!is_mt7915(&dev->mt76)) {
  			amsdu->max_mpdu_size =
-@@ -1017,8 +1017,8 @@ mt7915_is_ebf_supported(struct mt7915_phy *phy, struct ieee80211_vif *vif,
+@@ -1017,8 +1017,8 @@ mt7915_is_ebf_supported(struct mt7915_ph
  	if (!bfee && tx_ant < 2)
  		return false;
  
@@ -1068,7 +1016,7 @@ index 35441dcb..e29fd0b7 100644
  
  		if (bfee)
  			return mvif->cap.he_su_ebfee &&
-@@ -1028,8 +1028,8 @@ mt7915_is_ebf_supported(struct mt7915_phy *phy, struct ieee80211_vif *vif,
+@@ -1028,8 +1028,8 @@ mt7915_is_ebf_supported(struct mt7915_ph
  			       HE_PHY(CAP4_SU_BEAMFORMEE, pe->phy_cap_info[4]);
  	}
  
@@ -1097,7 +1045,7 @@ index 35441dcb..e29fd0b7 100644
  	struct ieee80211_sta_vht_cap *vc = &phy->mt76->sband_5g.sband.vht_cap;
  	u16 mcs_map = le16_to_cpu(pc->vht_mcs.rx_mcs_map);
  	u8 nss_mcs = mt7915_mcu_get_sta_nss(mcs_map);
-@@ -1101,14 +1101,14 @@ mt7915_mcu_sta_bfer_vht(struct ieee80211_sta *sta, struct mt7915_phy *phy,
+@@ -1101,14 +1101,14 @@ mt7915_mcu_sta_bfer_vht(struct ieee80211
  		bf->ncol = min_t(u8, nss_mcs, bf->nrow);
  		bf->ibf_ncol = bf->ncol;
  
@@ -1123,7 +1071,7 @@ index 35441dcb..e29fd0b7 100644
  	struct ieee80211_he_cap_elem *pe = &pc->he_cap_elem;
  	const struct ieee80211_sta_he_cap *vc =
  		mt76_connac_get_he_phy_cap(phy->mt76, vif);
-@@ -1142,7 +1142,7 @@ mt7915_mcu_sta_bfer_he(struct ieee80211_sta *sta, struct ieee80211_vif *vif,
+@@ -1142,7 +1142,7 @@ mt7915_mcu_sta_bfer_he(struct ieee80211_
  	bf->ncol = min_t(u8, nss_mcs, bf->nrow);
  	bf->ibf_ncol = bf->ncol;
  
@@ -1132,7 +1080,7 @@ index 35441dcb..e29fd0b7 100644
  		return;
  
  	/* go over for 160MHz and 80p80 */
-@@ -1190,7 +1190,7 @@ mt7915_mcu_sta_bfer_tlv(struct mt7915_dev *dev, struct sk_buff *skb,
+@@ -1190,7 +1190,7 @@ mt7915_mcu_sta_bfer_tlv(struct mt7915_de
  	};
  	bool ebf;
  
@@ -1141,7 +1089,7 @@ index 35441dcb..e29fd0b7 100644
  		return;
  
  	ebf = mt7915_is_ebf_supported(phy, vif, sta, false);
-@@ -1204,21 +1204,21 @@ mt7915_mcu_sta_bfer_tlv(struct mt7915_dev *dev, struct sk_buff *skb,
+@@ -1204,21 +1204,21 @@ mt7915_mcu_sta_bfer_tlv(struct mt7915_de
  	 * vht: support eBF and iBF
  	 * ht: iBF only, since mac80211 lacks of eBF support
  	 */
@@ -1169,7 +1117,7 @@ index 35441dcb..e29fd0b7 100644
  		bf->ibf_timeout = 0x48;
  	else
  		bf->ibf_timeout = 0x18;
-@@ -1228,7 +1228,7 @@ mt7915_mcu_sta_bfer_tlv(struct mt7915_dev *dev, struct sk_buff *skb,
+@@ -1228,7 +1228,7 @@ mt7915_mcu_sta_bfer_tlv(struct mt7915_de
  	else
  		bf->mem_20m = matrix[bf->nrow][bf->ncol];
  
@@ -1178,7 +1126,7 @@ index 35441dcb..e29fd0b7 100644
  	case IEEE80211_STA_RX_BW_160:
  	case IEEE80211_STA_RX_BW_80:
  		bf->mem_total = bf->mem_20m * 2;
-@@ -1253,7 +1253,7 @@ mt7915_mcu_sta_bfee_tlv(struct mt7915_dev *dev, struct sk_buff *skb,
+@@ -1253,7 +1253,7 @@ mt7915_mcu_sta_bfee_tlv(struct mt7915_de
  	struct tlv *tlv;
  	u8 nrow = 0;
  
@@ -1187,7 +1135,7 @@ index 35441dcb..e29fd0b7 100644
  		return;
  
  	if (!mt7915_is_ebf_supported(phy, vif, sta, true))
-@@ -1262,13 +1262,13 @@ mt7915_mcu_sta_bfee_tlv(struct mt7915_dev *dev, struct sk_buff *skb,
+@@ -1262,13 +1262,13 @@ mt7915_mcu_sta_bfee_tlv(struct mt7915_de
  	tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_BFEE, sizeof(*bfee));
  	bfee = (struct sta_rec_bfee *)tlv;
  
@@ -1205,7 +1153,7 @@ index 35441dcb..e29fd0b7 100644
  
  		nrow = FIELD_GET(IEEE80211_VHT_CAP_SOUNDING_DIMENSIONS_MASK,
  				 pc->cap);
-@@ -1324,7 +1324,7 @@ int mt7915_mcu_set_fixed_rate_ctrl(struct mt7915_dev *dev,
+@@ -1324,7 +1324,7 @@ int mt7915_mcu_set_fixed_rate_ctrl(struc
  			ra->phy = *phy;
  		break;
  	case RATE_PARAM_MMPS_UPDATE:
@@ -1214,7 +1162,7 @@ index 35441dcb..e29fd0b7 100644
  		break;
  	case RATE_PARAM_SPE_UPDATE:
  		ra->spe_idx = *(u8 *)data;
-@@ -1399,7 +1399,7 @@ mt7915_mcu_add_rate_ctrl_fixed(struct mt7915_dev *dev,
+@@ -1399,7 +1399,7 @@ mt7915_mcu_add_rate_ctrl_fixed(struct mt
  	do {									\
  		u8 i, gi = mask->control[band]._gi;				\
  		gi = (_he) ? gi : gi == NL80211_TXRATE_FORCE_SGI;		\
@@ -1223,7 +1171,7 @@ index 35441dcb..e29fd0b7 100644
  			phy.sgi |= gi << (i << (_he));				\
  			phy.he_ltf |= mask->control[band].he_ltf << (i << (_he));\
  		}								\
-@@ -1413,11 +1413,11 @@ mt7915_mcu_add_rate_ctrl_fixed(struct mt7915_dev *dev,
+@@ -1413,11 +1413,11 @@ mt7915_mcu_add_rate_ctrl_fixed(struct mt
  		}								\
  	} while (0)
  
@@ -1238,7 +1186,7 @@ index 35441dcb..e29fd0b7 100644
  		__sta_phy_bitrate_mask_check(ht_mcs, gi, 1, 0);
  	} else {
  		nrates = hweight32(mask->control[band].legacy);
-@@ -1451,7 +1451,7 @@ mt7915_mcu_add_rate_ctrl_fixed(struct mt7915_dev *dev,
+@@ -1451,7 +1451,7 @@ mt7915_mcu_add_rate_ctrl_fixed(struct mt
  		 * actual txrate hardware sends out.
  		 */
  		addr = mt7915_mac_wtbl_lmac_addr(dev, msta->wcid.idx, 7);
@@ -1247,7 +1195,7 @@ index 35441dcb..e29fd0b7 100644
  			mt76_rmw_field(dev, addr, GENMASK(31, 24), phy.sgi);
  		else
  			mt76_rmw_field(dev, addr, GENMASK(15, 12), phy.sgi);
-@@ -1484,7 +1484,7 @@ mt7915_mcu_sta_rate_ctrl_tlv(struct sk_buff *skb, struct mt7915_dev *dev,
+@@ -1484,7 +1484,7 @@ mt7915_mcu_sta_rate_ctrl_tlv(struct sk_b
  	enum nl80211_band band = chandef->chan->band;
  	struct sta_rec_ra *ra;
  	struct tlv *tlv;
@@ -1256,7 +1204,7 @@ index 35441dcb..e29fd0b7 100644
  	u32 cap = sta->wme ? STA_CAP_WMM : 0;
  
  	tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_RA, sizeof(*ra));
-@@ -1494,9 +1494,9 @@ mt7915_mcu_sta_rate_ctrl_tlv(struct sk_buff *skb, struct mt7915_dev *dev,
+@@ -1494,9 +1494,9 @@ mt7915_mcu_sta_rate_ctrl_tlv(struct sk_b
  	ra->auto_rate = true;
  	ra->phy_mode = mt76_connac_get_phy_mode(mphy, vif, band, sta);
  	ra->channel = chandef->chan->hw_value;
@@ -1269,7 +1217,7 @@ index 35441dcb..e29fd0b7 100644
  
  	if (supp_rate) {
  		supp_rate &= mask->control[band].legacy;
-@@ -1516,22 +1516,22 @@ mt7915_mcu_sta_rate_ctrl_tlv(struct sk_buff *skb, struct mt7915_dev *dev,
+@@ -1516,22 +1516,22 @@ mt7915_mcu_sta_rate_ctrl_tlv(struct sk_b
  		}
  	}
  
@@ -1300,7 +1248,7 @@ index 35441dcb..e29fd0b7 100644
  			cap |= STA_CAP_LDPC;
  
  		mt7915_mcu_set_sta_ht_mcs(sta, ra->ht_mcs,
-@@ -1539,37 +1539,37 @@ mt7915_mcu_sta_rate_ctrl_tlv(struct sk_buff *skb, struct mt7915_dev *dev,
+@@ -1539,37 +1539,37 @@ mt7915_mcu_sta_rate_ctrl_tlv(struct sk_b
  		ra->supp_ht_mcs = *(__le32 *)ra->ht_mcs;
  	}
  
@@ -1348,7 +1296,7 @@ index 35441dcb..e29fd0b7 100644
  					       IEEE80211_HE_6GHZ_CAP_MAX_AMPDU_LEN_EXP);
  	}
  
-@@ -1778,7 +1778,7 @@ mt7915_mcu_beacon_cntdwn(struct ieee80211_vif *vif, struct sk_buff *rskb,
+@@ -1778,7 +1778,7 @@ mt7915_mcu_beacon_cntdwn(struct ieee8021
  	if (!offs->cntdwn_counter_offs[0])
  		return;
  
@@ -1357,7 +1305,7 @@ index 35441dcb..e29fd0b7 100644
  	tlv = mt7915_mcu_add_nested_subtlv(rskb, sub_tag, sizeof(*info),
  					   &bcn->sub_ntlv, &bcn->len);
  	info = (struct bss_info_bcn_cntdwn *)tlv;
-@@ -1863,9 +1863,9 @@ mt7915_mcu_beacon_cont(struct mt7915_dev *dev, struct ieee80211_vif *vif,
+@@ -1863,9 +1863,9 @@ mt7915_mcu_beacon_cont(struct mt7915_dev
  	if (offs->cntdwn_counter_offs[0]) {
  		u16 offset = offs->cntdwn_counter_offs[0];
  
@@ -1369,7 +1317,7 @@ index 35441dcb..e29fd0b7 100644
  			cont->bcc_ofs = cpu_to_le16(offset - 3);
  	}
  
-@@ -2050,7 +2050,7 @@ int mt7915_mcu_add_beacon(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
+@@ -2050,7 +2050,7 @@ int mt7915_mcu_add_beacon(struct ieee802
  	if (!en)
  		goto out;
  
@@ -1378,7 +1326,7 @@ index 35441dcb..e29fd0b7 100644
  	if (!skb)
  		return -EINVAL;
  
-@@ -3181,17 +3181,17 @@ int mt7915_mcu_set_txpower_frame(struct mt7915_phy *phy,
+@@ -3181,17 +3181,17 @@ int mt7915_mcu_set_txpower_frame(struct
  	if (txpower) {
  		u32 offs, len, i;
  
@@ -1399,8 +1347,6 @@ index 35441dcb..e29fd0b7 100644
  					offs += len + sku_len[SKU_HE_RU26] * 3;
  					len = sku_len[SKU_HE_RU242] * 4;
  				}
-diff --git a/mt7915/soc.c b/mt7915/soc.c
-index 686c9bbd..777077cd 100644
 --- a/mt7915/soc.c
 +++ b/mt7915/soc.c
 @@ -4,7 +4,6 @@
@@ -1411,11 +1357,9 @@ index 686c9bbd..777077cd 100644
  #include <linux/of.h>
  #include <linux/of_device.h>
  #include <linux/of_reserved_mem.h>
-diff --git a/mt7921/dma.c b/mt7921/dma.c
-index d1f10f6d..6456c9a6 100644
 --- a/mt7921/dma.c
 +++ b/mt7921/dma.c
-@@ -283,8 +283,8 @@ int mt7921_dma_init(struct mt7921_dev *dev)
+@@ -283,8 +283,8 @@ int mt7921_dma_init(struct mt7921_dev *d
  	if (ret < 0)
  		return ret;
  
@@ -1426,11 +1370,9 @@ index d1f10f6d..6456c9a6 100644
  	napi_enable(&dev->mt76.tx_napi);
  
  	return mt7921_dma_enable(dev);
-diff --git a/mt7921/init.c b/mt7921/init.c
-index d4b681d7..9bf5d9f0 100644
 --- a/mt7921/init.c
 +++ b/mt7921/init.c
-@@ -76,8 +76,8 @@ mt7921_init_wiphy(struct ieee80211_hw *hw)
+@@ -76,8 +76,8 @@ mt7921_init_wiphy(struct ieee80211_hw *h
  	struct wiphy *wiphy = hw->wiphy;
  
  	hw->queues = 4;
@@ -1441,11 +1383,9 @@ index d4b681d7..9bf5d9f0 100644
  	hw->netdev_features = NETIF_F_RXCSUM;
  
  	hw->radiotap_timestamp.units_pos =
-diff --git a/mt7921/mac.c b/mt7921/mac.c
-index 82db3762..47f79f16 100644
 --- a/mt7921/mac.c
 +++ b/mt7921/mac.c
-@@ -496,7 +496,7 @@ static void mt7921_tx_check_aggr(struct ieee80211_sta *sta, __le32 *txwi)
+@@ -496,7 +496,7 @@ static void mt7921_tx_check_aggr(struct
  	u16 fc, tid;
  	u32 val;
  
@@ -1454,11 +1394,9 @@ index 82db3762..47f79f16 100644
  		return;
  
  	tid = le32_get_bits(txwi[1], MT_TXD1_TID);
-diff --git a/mt7921/main.c b/mt7921/main.c
-index 76ac5069..a1611590 100644
 --- a/mt7921/main.c
 +++ b/mt7921/main.c
-@@ -171,8 +171,7 @@ mt7921_init_he_caps(struct mt7921_phy *phy, enum nl80211_band band,
+@@ -171,8 +171,7 @@ mt7921_init_he_caps(struct mt7921_phy *p
  			mt7921_gen_ppe_thresh(he_cap->ppe_thres, nss);
  		} else {
  			he_cap_elem->phy_cap_info[9] |=
@@ -1468,7 +1406,7 @@ index 76ac5069..a1611590 100644
  		}
  
  		if (band == NL80211_BAND_6GHZ) {
-@@ -691,8 +690,7 @@ out:
+@@ -686,8 +685,7 @@ out:
  }
  
  static int
@@ -1478,7 +1416,7 @@ index 76ac5069..a1611590 100644
  	       const struct ieee80211_tx_queue_params *params)
  {
  	struct mt7921_vif *mvif = (struct mt7921_vif *)vif->drv_priv;
-@@ -762,7 +760,7 @@ static void mt7921_configure_filter(struct ieee80211_hw *hw,
+@@ -757,7 +755,7 @@ static void mt7921_configure_filter(stru
  static void mt7921_bss_info_changed(struct ieee80211_hw *hw,
  				    struct ieee80211_vif *vif,
  				    struct ieee80211_bss_conf *info,
@@ -1487,7 +1425,7 @@ index 76ac5069..a1611590 100644
  {
  	struct mt7921_phy *phy = mt7921_hw_phy(hw);
  	struct mt7921_dev *dev = mt7921_hw_dev(hw);
-@@ -793,7 +791,7 @@ static void mt7921_bss_info_changed(struct ieee80211_hw *hw,
+@@ -788,7 +786,7 @@ static void mt7921_bss_info_changed(stru
  	if (changed & BSS_CHANGED_ASSOC) {
  		mt7921_mcu_sta_update(dev, NULL, vif, true,
  				      MT76_STA_INFO_STATE_ASSOC);
@@ -1496,7 +1434,7 @@ index 76ac5069..a1611590 100644
  	}
  
  	if (changed & BSS_CHANGED_ARP_FILTER) {
-@@ -1640,8 +1638,8 @@ mt7921_channel_switch_beacon(struct ieee80211_hw *hw,
+@@ -1635,8 +1633,8 @@ mt7921_channel_switch_beacon(struct ieee
  }
  
  static int
@@ -1507,7 +1445,7 @@ index 76ac5069..a1611590 100644
  {
  	struct mt7921_vif *mvif = (struct mt7921_vif *)vif->drv_priv;
  	struct mt7921_phy *phy = mt7921_hw_phy(hw);
-@@ -1668,8 +1666,8 @@ out:
+@@ -1663,8 +1661,8 @@ out:
  }
  
  static void
@@ -1518,11 +1456,9 @@ index 76ac5069..a1611590 100644
  {
  	struct mt7921_vif *mvif = (struct mt7921_vif *)vif->drv_priv;
  	struct mt7921_phy *phy = mt7921_hw_phy(hw);
-diff --git a/mt7921/mcu.c b/mt7921/mcu.c
-index 8930b5a4..672bd987 100644
 --- a/mt7921/mcu.c
 +++ b/mt7921/mcu.c
-@@ -862,7 +862,7 @@ int mt7921_mcu_uni_bss_ps(struct mt7921_dev *dev, struct ieee80211_vif *vif)
+@@ -862,7 +862,7 @@ int mt7921_mcu_uni_bss_ps(struct mt7921_
  		.ps = {
  			.tag = cpu_to_le16(UNI_BSS_INFO_PS),
  			.len = cpu_to_le16(sizeof(struct ps_tlv)),
@@ -1531,7 +1467,7 @@ index 8930b5a4..672bd987 100644
  		},
  	};
  
-@@ -926,7 +926,7 @@ mt7921_mcu_set_bss_pm(struct mt7921_dev *dev, struct ieee80211_vif *vif,
+@@ -926,7 +926,7 @@ mt7921_mcu_set_bss_pm(struct mt7921_dev
  		u8 pad;
  	} req = {
  		.bss_idx = mvif->mt76.idx,
@@ -1540,7 +1476,7 @@ index 8930b5a4..672bd987 100644
  		.dtim_period = vif->bss_conf.dtim_period,
  		.bcn_interval = cpu_to_le16(vif->bss_conf.beacon_int),
  	};
-@@ -1143,7 +1143,7 @@ mt7921_mcu_uni_add_beacon_offload(struct mt7921_dev *dev,
+@@ -1143,7 +1143,7 @@ mt7921_mcu_uni_add_beacon_offload(struct
  	if (!enable)
  		return -EOPNOTSUPP;
  
@@ -1549,11 +1485,9 @@ index 8930b5a4..672bd987 100644
  	if (!skb)
  		return -EINVAL;
  
-diff --git a/mt7921/pci_mac.c b/mt7921/pci_mac.c
-index 8dd60408..436f07ba 100644
 --- a/mt7921/pci_mac.c
 +++ b/mt7921/pci_mac.c
-@@ -113,7 +113,7 @@ int mt7921e_mac_reset(struct mt7921_dev *dev)
+@@ -113,7 +113,7 @@ int mt7921e_mac_reset(struct mt7921_dev
  
  	err = mt7921e_driver_own(dev);
  	if (err)
@@ -1562,11 +1496,9 @@ index 8dd60408..436f07ba 100644
  
  	err = mt7921_run_firmware(dev);
  	if (err)
-diff --git a/tx.c b/tx.c
-index 1f309d05..6cda23fa 100644
 --- a/tx.c
 +++ b/tx.c
-@@ -60,20 +60,15 @@ mt76_tx_status_unlock(struct mt76_dev *dev, struct sk_buff_head *list)
+@@ -60,20 +60,15 @@ mt76_tx_status_unlock(struct mt76_dev *d
  			.skb = skb,
  			.info = IEEE80211_SKB_CB(skb),
  		};
@@ -1590,11 +1522,9 @@ index 1f309d05..6cda23fa 100644
  		}
  
  		hw = mt76_tx_status_get_hw(dev, skb);
-diff --git a/usb.c b/usb.c
-index 3e281715..369c27ab 100644
 --- a/usb.c
 +++ b/usb.c
-@@ -1075,7 +1075,7 @@ int __mt76u_init(struct mt76_dev *dev, struct usb_interface *intf,
+@@ -1075,7 +1075,7 @@ int __mt76u_init(struct mt76_dev *dev, s
  
  	INIT_WORK(&usb->stat_work, mt76u_tx_status_data);
  
@@ -1603,6 +1533,3 @@ index 3e281715..369c27ab 100644
  	if (usb->data_len < 32)
  		usb->data_len = 32;
  
--- 
-2.17.1
-
diff --git a/package/kernel/mt76/patches/002-Revert-wifi-mt76-mt7921-introduce-chanctx-support.patch b/package/kernel/mt76/patches/002-Revert-wifi-mt76-mt7921-introduce-chanctx-support.patch
index 85fe650d1f3ac3..b5a1b88b26d6f2 100644
--- a/package/kernel/mt76/patches/002-Revert-wifi-mt76-mt7921-introduce-chanctx-support.patch
+++ b/package/kernel/mt76/patches/002-Revert-wifi-mt76-mt7921-introduce-chanctx-support.patch
@@ -14,11 +14,9 @@ This reverts commit 2575de3aea332837a0784629b11146efa1c55e58.
  mt7921/usb.c    |   7 ---
  7 files changed, 17 insertions(+), 157 deletions(-)
 
-diff --git a/mt7921/init.c b/mt7921/init.c
-index 9bf5d9f0..c16aeab0 100644
 --- a/mt7921/init.c
 +++ b/mt7921/init.c
-@@ -26,27 +26,6 @@ static const struct ieee80211_iface_combination if_comb[] = {
+@@ -26,27 +26,6 @@ static const struct ieee80211_iface_comb
  		.max_interfaces = MT7921_MAX_INTERFACES,
  		.num_different_channels = 1,
  		.beacon_int_infra_match = true,
@@ -46,7 +44,7 @@ index 9bf5d9f0..c16aeab0 100644
  	}
  };
  
-@@ -88,19 +67,17 @@ mt7921_init_wiphy(struct ieee80211_hw *hw)
+@@ -88,19 +67,17 @@ mt7921_init_wiphy(struct ieee80211_hw *h
  	hw->sta_data_size = sizeof(struct mt7921_sta);
  	hw->vif_data_size = sizeof(struct mt7921_vif);
  
@@ -71,8 +69,6 @@ index 9bf5d9f0..c16aeab0 100644
  	wiphy->max_remain_on_channel_duration = 5000;
  	wiphy->max_scan_ie_len = MT76_CONNAC_SCAN_IE_LEN;
  	wiphy->max_scan_ssids = 4;
-diff --git a/mt7921/mac.c b/mt7921/mac.c
-index 47f79f16..639614b0 100644
 --- a/mt7921/mac.c
 +++ b/mt7921/mac.c
 @@ -168,6 +168,14 @@ static void
@@ -90,11 +86,9 @@ index 47f79f16..639614b0 100644
  	if (chfreq > 180) {
  		status->band = NL80211_BAND_6GHZ;
  		chfreq = (chfreq - 181) * 4 + 1;
-diff --git a/mt7921/main.c b/mt7921/main.c
-index a1611590..1b7219e3 100644
 --- a/mt7921/main.c
 +++ b/mt7921/main.c
-@@ -856,7 +856,7 @@ void mt7921_mac_sta_assoc(struct mt76_dev *mdev, struct ieee80211_vif *vif,
+@@ -851,7 +851,7 @@ void mt7921_mac_sta_assoc(struct mt76_de
  
  	if (vif->type == NL80211_IFTYPE_STATION && !sta->tdls)
  		mt76_connac_mcu_uni_add_bss(&dev->mphy, vif, &mvif->sta.wcid,
@@ -103,7 +97,7 @@ index a1611590..1b7219e3 100644
  
  	mt7921_mac_wtbl_update(dev, msta->wcid.idx,
  			       MT_WTBL_UPDATE_ADM_COUNT_CLEAR);
-@@ -889,7 +889,7 @@ void mt7921_mac_sta_remove(struct mt76_dev *mdev, struct ieee80211_vif *vif,
+@@ -884,7 +884,7 @@ void mt7921_mac_sta_remove(struct mt76_d
  		if (!sta->tdls)
  			mt76_connac_mcu_uni_add_bss(&dev->mphy, vif,
  						    &mvif->sta.wcid, false,
@@ -112,7 +106,7 @@ index a1611590..1b7219e3 100644
  	}
  
  	spin_lock_bh(&dev->sta_poll_lock);
-@@ -1649,7 +1649,7 @@ mt7921_start_ap(struct ieee80211_hw *hw,
+@@ -1644,7 +1644,7 @@ mt7921_start_ap(struct ieee80211_hw *hw,
  	mt7921_mutex_acquire(dev);
  
  	err = mt76_connac_mcu_uni_add_bss(phy->mt76, vif, &mvif->sta.wcid,
@@ -121,7 +115,7 @@ index a1611590..1b7219e3 100644
  	if (err)
  		goto out;
  
-@@ -1681,108 +1681,12 @@ mt7921_stop_ap(struct ieee80211_hw *hw,
+@@ -1676,105 +1676,12 @@ mt7921_stop_ap(struct ieee80211_hw *hw,
  		goto out;
  
  	mt76_connac_mcu_uni_add_bss(phy->mt76, vif, &mvif->sta.wcid, false,
@@ -221,17 +215,14 @@ index a1611590..1b7219e3 100644
 -				   struct ieee80211_prep_tx_info *info)
 -{
 -	struct mt7921_vif *mvif = (struct mt7921_vif *)vif->drv_priv;
--	struct mt7921_dev *dev = mt7921_hw_dev(hw);
 -
--	mt7921_mutex_acquire(dev);
 -	mt7921_abort_roc(mvif->phy, mvif);
--	mt7921_mutex_release(dev);
 -}
 -
  const struct ieee80211_ops mt7921_ops = {
  	.tx = mt7921_tx,
  	.start = mt7921_start,
-@@ -1835,13 +1739,6 @@ const struct ieee80211_ops mt7921_ops = {
+@@ -1827,13 +1734,6 @@ const struct ieee80211_ops mt7921_ops =
  	.set_sar_specs = mt7921_set_sar_specs,
  	.remain_on_channel = mt7921_remain_on_channel,
  	.cancel_remain_on_channel = mt7921_cancel_remain_on_channel,
@@ -245,8 +236,6 @@ index a1611590..1b7219e3 100644
  };
  EXPORT_SYMBOL_GPL(mt7921_ops);
  
-diff --git a/mt7921/mt7921.h b/mt7921/mt7921.h
-index efff4d43..0954ac6c 100644
 --- a/mt7921/mt7921.h
 +++ b/mt7921/mt7921.h
 @@ -171,7 +171,6 @@ struct mt7921_vif {
@@ -257,11 +246,9 @@ index efff4d43..0954ac6c 100644
  };
  
  struct mib_stats {
-diff --git a/mt7921/pci.c b/mt7921/pci.c
-index d84dbdd1..fbb06f04 100644
 --- a/mt7921/pci.c
 +++ b/mt7921/pci.c
-@@ -297,13 +297,6 @@ static int mt7921_pci_probe(struct pci_dev *pdev,
+@@ -297,13 +297,6 @@ static int mt7921_pci_probe(struct pci_d
  	if (!(features & MT7921_FW_CAP_CNM)) {
  		ops->remain_on_channel = NULL;
  		ops->cancel_remain_on_channel = NULL;
@@ -275,11 +262,9 @@ index d84dbdd1..fbb06f04 100644
  	}
  
  	mdev = mt76_alloc_device(&pdev->dev, sizeof(*dev), ops, &drv_ops);
-diff --git a/mt7921/sdio.c b/mt7921/sdio.c
-index 3f8973fb..f6b35087 100644
 --- a/mt7921/sdio.c
 +++ b/mt7921/sdio.c
-@@ -140,13 +140,6 @@ static int mt7921s_probe(struct sdio_func *func,
+@@ -140,13 +140,6 @@ static int mt7921s_probe(struct sdio_fun
  	if (!(features & MT7921_FW_CAP_CNM)) {
  		ops->remain_on_channel = NULL;
  		ops->cancel_remain_on_channel = NULL;
@@ -293,11 +278,9 @@ index 3f8973fb..f6b35087 100644
  	}
  
  	mdev = mt76_alloc_device(&func->dev, sizeof(*dev), ops, &drv_ops);
-diff --git a/mt7921/usb.c b/mt7921/usb.c
-index 5321d20d..8a49d3de 100644
 --- a/mt7921/usb.c
 +++ b/mt7921/usb.c
-@@ -218,13 +218,6 @@ static int mt7921u_probe(struct usb_interface *usb_intf,
+@@ -218,13 +218,6 @@ static int mt7921u_probe(struct usb_inte
  	if (!(features & MT7921_FW_CAP_CNM)) {
  		ops->remain_on_channel = NULL;
  		ops->cancel_remain_on_channel = NULL;
@@ -311,6 +294,3 @@ index 5321d20d..8a49d3de 100644
  	}
  
  	ops->stop = mt7921u_stop;
--- 
-2.17.1
-
diff --git a/package/kernel/mt76/patches/003-Revert-changed-IEEE80211_MAX_AMPDU_BUF-defi.patch b/package/kernel/mt76/patches/003-Revert-changed-IEEE80211_MAX_AMPDU_BUF-defi.patch
index 1f84c601fbabc9..65ad25b9ebdd6f 100644
--- a/package/kernel/mt76/patches/003-Revert-changed-IEEE80211_MAX_AMPDU_BUF-defi.patch
+++ b/package/kernel/mt76/patches/003-Revert-changed-IEEE80211_MAX_AMPDU_BUF-defi.patch
@@ -15,11 +15,9 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
  mt7915/init.c | 5 +++++
  1 file changed, 5 insertions(+)
 
-diff --git a/mt7915/init.c b/mt7915/init.c
-index 489f6e77..1813370a 100644
 --- a/mt7915/init.c
 +++ b/mt7915/init.c
-@@ -327,8 +327,8 @@ mt7915_init_wiphy(struct ieee80211_hw *hw)
+@@ -329,8 +329,8 @@ mt7915_init_wiphy(struct mt7915_phy *phy
  	struct mt7915_dev *dev = phy->dev;
  
  	hw->queues = 4;
@@ -30,5 +28,3 @@ index 489f6e77..1813370a 100644
  	hw->netdev_features = NETIF_F_RXCSUM;
  
  	hw->radiotap_timestamp.units_pos =
--- 
-2.37.2
diff --git a/package/kernel/mt76/patches/020-fix-crash-in-chip-reset-fail.patch b/package/kernel/mt76/patches/020-fix-crash-in-chip-reset-fail.patch
index 2777d142e3e328..fe3579e0e5d5cf 100644
--- a/package/kernel/mt76/patches/020-fix-crash-in-chip-reset-fail.patch
+++ b/package/kernel/mt76/patches/020-fix-crash-in-chip-reset-fail.patch
@@ -1,6 +1,6 @@
 --- a/mt7921/pci_mac.c
 +++ b/mt7921/pci_mac.c
-@@ -261,7 +261,7 @@  int mt7921e_mac_reset(struct mt7921_dev *dev)
+@@ -113,7 +113,7 @@ int mt7921e_mac_reset(struct mt7921_dev
  
  	err = mt7921e_driver_own(dev);
  	if (err)
diff --git a/package/kernel/mt76/patches/090-backport-to-linux-5.19.patch b/package/kernel/mt76/patches/090-backport-to-linux-5.19.patch
index 44a14950ad84a9..5a274bd14713f0 100644
--- a/package/kernel/mt76/patches/090-backport-to-linux-5.19.patch
+++ b/package/kernel/mt76/patches/090-backport-to-linux-5.19.patch
@@ -1,6 +1,6 @@
 --- a/usb.c
 +++ b/usb.c
-@@ -1068,7 +1068,11 @@
+@@ -1075,7 +1075,11 @@ int __mt76u_init(struct mt76_dev *dev, s
  
  	INIT_WORK(&usb->stat_work, mt76u_tx_status_data);
  
diff --git a/package/kernel/mt76/patches/091-fix-linux-6.1-build.patch b/package/kernel/mt76/patches/091-fix-linux-6.1-build.patch
index 0b7ee7b3e2c664..592d523f0af0f6 100644
--- a/package/kernel/mt76/patches/091-fix-linux-6.1-build.patch
+++ b/package/kernel/mt76/patches/091-fix-linux-6.1-build.patch
@@ -1,6 +1,6 @@
 --- a/mt7921/dma.c
---- b/mt7921/dma.c
-@@ -283,10 +283,15 @@
++++ b/mt7921/dma.c
+@@ -283,10 +283,15 @@ int mt7921_dma_init(struct mt7921_dev *d
  	if (ret < 0)
  		return ret;
  
@@ -18,8 +18,8 @@
  }
  
 --- a/dma.c
---- b/dma.c
-@@ -895,7 +895,11 @@
++++ b/dma.c
+@@ -910,7 +910,11 @@ mt76_dma_init(struct mt76_dev *dev,
  	dev->napi_dev.threaded = 1;
  
  	mt76_for_each_q_rx(dev, i) {
diff --git a/package/network/services/uhttpd/Makefile b/package/network/services/uhttpd/Makefile
index 860b41f1a4afb6..55ca3f6818970d 100644
--- a/package/network/services/uhttpd/Makefile
+++ b/package/network/services/uhttpd/Makefile
@@ -12,9 +12,9 @@ PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/uhttpd.git
-PKG_SOURCE_DATE:=2022-06-01
-PKG_SOURCE_VERSION:=d59d732a10a4a2b9f18af6dfc3facf696108f31e
-PKG_MIRROR_HASH:=31caa46ca025a1a7657bd5252d59d4a67d0f1c4b87c15a1bc94663ba3cc899ee
+PKG_SOURCE_DATE:=2022-10-31
+PKG_SOURCE_VERSION:=23977554d9694d025eada50a5547e99ee1be7838
+PKG_MIRROR_HASH:=e546fd57d0d0be6a51e2aeb5797febe8c89d2bba61b26c930ecb0616d5f6ace9
 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 PKG_LICENSE:=ISC
 
diff --git a/package/network/services/uhttpd/files/uhttpd.init b/package/network/services/uhttpd/files/uhttpd.init
index 8dbc23f59c1e01..bfde231bf62f70 100755
--- a/package/network/services/uhttpd/files/uhttpd.init
+++ b/package/network/services/uhttpd/files/uhttpd.init
@@ -222,6 +222,7 @@ start_instance()
 service_triggers()
 {
 	procd_add_reload_trigger "uhttpd"
+	procd_add_raw_trigger acme.renew 5000 /etc/init.d/uhttpd reload
 }
 
 start_service() {