Merge branch 'bananapi4-nvme-wip' into bananapi4-debug

N-Storm · Dec 2, 2024 · c43482f · c43482f
2 parents e0d300a + 92b7722
commit c43482f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/config-nstorm-bananapi-bpi-r4 b/config-nstorm-bananapi-bpi-r4
@@ -767,7 +767,7 @@ CONFIG_USE_LTO=y
 CONFIG_USE_MOLD=y
 CONFIG_VERSIONOPT=y
 CONFIG_VERSION_BUG_URL=""
-CONFIG_VERSION_CODE="20241126-r42-nvme13"
+CONFIG_VERSION_CODE="20241202-r42-nvme15"
 CONFIG_VERSION_CODE_FILENAMES=y
 CONFIG_VERSION_DIST="OpenWrt"
 CONFIG_VERSION_FILENAMES=y

diff --git a/package/kernel/mt76/Makefile b/package/kernel/mt76/Makefile
@@ -41,8 +41,6 @@ define KernelPackage/mt76-default
   DEPENDS:= \
 	+kmod-mac80211 \
 	+@DRIVER_11AC_SUPPORT \
-	+@DRIVER_11AX_SUPPORT \
-	+@DRIVER_11BE_SUPPORT \
 	+@KERNEL_PAGE_POOL
 endef
 
@@ -320,7 +318,8 @@ endef
 define KernelPackage/mt7996e
   $(KernelPackage/mt76-default)
   TITLE:=MediaTek MT7996E wireless driver
-  DEPENDS+=@PCI_SUPPORT +kmod-mt76-core +kmod-mt76-connac +kmod-hwmon-core +kmod-thermal +@DRIVER_11AX_SUPPORT +@DRIVER_11BE_SUPPORT +@KERNEL_RELAY
+  DEPENDS+=@PCI_SUPPORT +kmod-mt76-connac +kmod-hwmon-core +@DRIVER_11AX_SUPPORT \
+  	   +@KERNEL_RELAY +@DRIVER_11BE_SUPPORT
   FILES:= $(PKG_BUILD_DIR)/mt7996/mt7996e.ko
   AUTOLOAD:=$(call AutoProbe,mt7996e)
 endef

diff --git a/package/network/config/wifi-scripts/files/lib/wifi/mac80211.uc b/package/network/config/wifi-scripts/files/lib/wifi/mac80211.uc
@@ -4,7 +4,6 @@ import * as uci from 'uci';
 
 const bands_order = [ "6G", "5G", "2G" ];
 const htmode_order = [ "EHT", "HE", "VHT", "HT" ];
-const htmode_order = [ "EHT", "HE", "VHT", "HT" ];
 
 let board = json(readfile("/etc/board.json"));
 if (!board.wlan)
@@ -83,7 +82,6 @@ for (let phy_name, phy in board.wlan) {
         let band_idx = 0;
         let ssid = "";
         let country = "US";
-        let channel = 0;
         let htmode = "NOHT";
 
         if (band_name == "6G") {
@@ -96,17 +94,21 @@ for (let phy_name, phy in board.wlan) {
         } else if (band_name == "5G") {
                 htmode = "EHT160";
                 noscan = 1;
+                channel = "40";
                 rnr = 1;
                 background_radar = 1;
                 band_idx = 1;
                 ssid = "OpenWrt-5g";
         } else {
                 htmode = "EHT40";
+                channel = "4";
                 noscan = 1;
                 rnr = 1;
                 ssid = "OpenWrt-2g";
         }
 
+        band_name = lc(band_name);
+
         print(`set ${s}=wifi-device
 set ${s}.type='mac80211'
 set ${s}.${id}