update newest firmware

package/mtk/applications/luci-app-mtwifi-cfg/po/zh_Hans/mtwifi-cfg.po

@@ -48,3 +48,10 @@ msgstr "无线硬件加速"
 
 msgid "Band Steering"
 msgstr "引导已连接的强信号双频2.4G设备至5G频段"
+
+msgid "Wireless configuration error"
+msgstr "无线网络设置错误"
+
+msgid "At least one MBSSID needs to be reserved"
+msgstr "至少需要保留1个MBSSID"
+

package/mtk/applications/luci-app-mtwifi-cfg/root/usr/share/luci-app-mtwifi-cfg/wireless-mtk.js

@@ -924,7 +924,7 @@ return view.extend({
 					E('button', {
 						'class': 'cbi-button cbi-button-negative remove',
 						'title': _('Delete this network'),
-						'click': ui.createHandlerFn(this, 'handleRemove', section_id)
+						'click': ui.createHandlerFn(this, 'handleRemove', section_id, inst)
 					}, _('Remove'))
 				];
 			}
@@ -1418,10 +1418,12 @@ return view.extend({
 				o.depends('encryption', 'wpa2');
 				o.depends('encryption', 'wpa3');
 				o.depends('encryption', 'wpa3-mixed');
-				o.depends('encryption', 'psk');
 				o.depends('encryption', 'psk2');
 				o.depends('encryption', 'wpa-mixed');
 				o.depends('encryption', 'psk-mixed');
+				if (hwtype != 'mtwifi') {
+ 					o.depends('encryption', 'psk');
+ 				}
 				o.value('auto', _('auto'));
 				o.value('ccmp', _('Force CCMP (AES)'));
 				o.value('tkip', _('Force TKIP'));
@@ -2003,11 +2005,36 @@ return view.extend({
 			});
 		};
 
-		s.handleRemove = function(section_id, ev) {
+		s.handleRemove = function(section_id, radioNet, ev) {
+			var radioName = radioNet.getWifiDeviceName();
+			var hwtype = uci.get('wireless', radioName, 'type');
+
+			if (hwtype == 'mtwifi')
+			{
+				var wifi_sections = uci.sections('wireless', 'wifi-iface');
+				var mbssid_num = 0;
+
+				for (var i = 0; i < wifi_sections.length; i++) {
+					if (wifi_sections[i].device == radioName && wifi_sections[i].mode == "ap")
+						mbssid_num++;
+				}
+
+				if (mbssid_num <= 1)
+					return ui.showModal(_('Wireless configuration error'), [
+						E('p', _('At least one MBSSID needs to be reserved')),
+						E('div', { 'class': 'right' },
+						E('button', {
+							'class': 'btn',
+							'click': ui.hideModal
+						}, _('Close')))
+					]);
+			}
+
 			document.querySelector('.cbi-section-table-row[data-sid="%s"]'.format(section_id)).style.opacity = 0.5;
 			return form.TypedSection.prototype.handleRemove.apply(this, [section_id, ev]);
 		};
 
+
 		s.handleScan = function(radioDev, ev) {
 			var table = E('table', { 'class': 'table' }, [
 				E('tr', { 'class': 'tr table-titles' }, [

package/mtk/applications/mtwifi-cfg/files/mtwifi-cfg/mtwifi_cfg

@@ -460,9 +460,9 @@ function mtwifi_cfg_setup(argv)
         if dats.ApCliEnable == 1 then
             dats.MUTxRxEnable = 3
         else
-            dats.MUTxRxEnable = 1
+            dats.MUTxRxEnable =3
         end
-        dats.ITxBfEn = 0
+        dats.ITxBfEn = 1
     else
         dats.ETxBfEnCond = 0
         dats.MUTxRxEnable = 0
@@ -523,8 +523,8 @@ function mtwifi_cfg_setup(argv)
             set_dat(dats, apidx, "RRMEnable", v.config.ieee80211k)
             set_dat(dats, apidx, "FtSupport", v.config.ieee80211r)
             set_dat(dats, apidx, "RekeyInterval", v.config.wpa_group_rekey)
-            set_dat(dats, apidx, "MuMimoDlEnable",v.config.mumimo_dl)
-            set_dat(dats, apidx, "MuMimoUlEnable",v.config.mumimo_ul)
+            set_dat(dats, apidx, "MuMimoDlEnable",0)
+            set_dat(dats, apidx, "MuMimoUlEnable",0)
             set_dat(dats, apidx, "MuOfdmaDlEnable",v.config.ofdma_dl)
             set_dat(dats, apidx, "MuOfdmaUlEnable",v.config.ofdma_ul)
             set_dat(dats, apidx, "HT_AMSDU",v.config.amsdu)

package/mtk/drivers/mt_wifi/Makefile

@@ -8,7 +8,7 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=mt_wifi
 
-MT7981_FW_DIR := mt7981-fw-20230306
+MT7981_FW_DIR := mt7981-fw-20230411
 MT7986_FW_DIR := mt7986-fw-20230808
 
 ifeq ($(CONFIG_MTK_CHIP_MT7981),y)

package/mtk/drivers/warp/Makefile

@@ -77,7 +77,7 @@ define KernelPackage/warp/install
 		if [ "$$(CONFIG_WARP_NEW_FW)" = "y" ]; then \
 			cp ./files/$$(MT7981_NEW_WOFW_DIR)/7981*WOCPU*_RAM_CODE_release.bin $(1)/lib/firmware/; \
 		else \
-			cp $(PKG_BUILD_DIR)/bin/7981*WOCPU*_RAM_CODE_release.bin $(1)/lib/firmware/; \
+			cp ./files/$$(MT7981_NEW_WOFW_DIR)/7981*WOCPU*_RAM_CODE_release.bin $(1)/lib/firmware/; \
 		fi; \
 	elif [ "$$(CONFIG_WARP_CHIPSET)" = "mt7986" ]; then \
 		if [ "$$(CONFIG_WARP_NEW_FW)" = "y" ]; then \