Merge Official Source

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>

package/kernel/mt76/Makefile

@@ -8,9 +8,9 @@ PKG_LICENSE_FILES:=
 
 PKG_SOURCE_URL:=https://github.com/openwrt/mt76
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_DATE:=2024-02-03
-PKG_SOURCE_VERSION:=6124ea9135ed512671933f5520c46842906c78bc
-PKG_MIRROR_HASH:=acc326d7b15c9c72b494ed601300be329553f896e65c7f045e6a09327304c34a
+PKG_SOURCE_DATE:=2024-03-18
+PKG_SOURCE_VERSION:=2135e201e7a9339e018d4e2d4a33c73266e674d7
+PKG_MIRROR_HASH:=810f636c60c86e6a426c676c3bf7aaea2f711feb31f4a66889d485112b612745
 
 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 PKG_USE_NINJA:=0

package/kernel/mt76/patches/0001-wifi-mt76-fix-the-issue-of-missing-txpwr-settings-fr.patch

@@ -1,28 +0,0 @@
-From 841bf82e99581f648325bee570de98892cad894f Mon Sep 17 00:00:00 2001
-From: Ming Yen Hsieh <mingyen.hsieh@mediatek.com>
-Date: Wed, 7 Feb 2024 11:31:23 +0800
-Subject: [PATCH] wifi: mt76: fix the issue of missing txpwr settings from
- ch153 to ch177
-
-Because the number of channels to be configured is calculated using the %,
-and it results in 0 when there's an exact division, this leads to some
-channels not having their tx power configured.
-
-Fixes: 7801da338856 ("wifi: mt76: mt7921: enable set txpower for UNII-4")
-Signed-off-by: Ming Yen Hsieh <mingyen.hsieh@mediatek.com>
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- mt76_connac_mcu.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/mt76_connac_mcu.c
-+++ b/mt76_connac_mcu.c
-@@ -2104,7 +2104,7 @@ mt76_connac_mcu_rate_txpower_band(struct
- 		int j, msg_len, num_ch;
- 		struct sk_buff *skb;
- 
--		num_ch = i == batch_size - 1 ? n_chan % batch_len : batch_len;
-+		num_ch = i == batch_size - 1 ? n_chan - i * batch_len : batch_len;
- 		msg_len = sizeof(tx_power_tlv) + num_ch * sizeof(sku_tlbv);
- 		skb = mt76_mcu_msg_alloc(dev, NULL, msg_len);
- 		if (!skb) {