Merge branch 'bananapi4' of github.com:rmandrad/openwrt into rmandrad…

…-bananapi4
N-Storm · Oct 1, 2024 · 0179bbe · 0179bbe
2 parents d06fa70 + fc5db1a
commit 0179bbe
Show file tree

Hide file tree

Showing 12 changed files with 39 additions and 1,242 deletions.
diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile
@@ -80,6 +80,10 @@ config-y:= \
 	WLAN_VENDOR_ST \
 	WLAN_VENDOR_TI \
 	WLAN_VENDOR_ZYDAS \
+	MAC80211_DEBUG_MENU \
+	MAC80211_MLME_DEBUG \
+	MAC80211_STA_DEBUG \
+	MAC80211_HT_DEBUG \
 
 config-$(call config_package,cfg80211,$(ALL_VARIANTS)) += CFG80211
 config-$(CONFIG_PACKAGE_CFG80211_TESTMODE) += NL80211_TESTMODE

diff --git a/...patches/subsys/400-allow-ibss-mixed.patch → ...patches/subsys/220-allow-ibss-mixed.patch b/...patches/subsys/400-allow-ibss-mixed.patch → ...patches/subsys/220-allow-ibss-mixed.patch
diff --git a/...sys/780-avoid-crashing-missing-band.patch → ...sys/230-avoid-crashing-missing-band.patch b/...sys/780-avoid-crashing-missing-band.patch → ...sys/230-avoid-crashing-missing-band.patch
@@ -18,7 +18,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
 
 --- a/net/mac80211/sta_info.c
 +++ b/net/mac80211/sta_info.c
-@@ -2455,6 +2455,13 @@ static void sta_stats_decode_rate(struct
+@@ -2439,6 +2439,13 @@ static void sta_stats_decode_rate(struct
 
  		sband = local->hw.wiphy->bands[band];
 

diff --git a/...ace-period-for-DFS-available-after-.patch → ...ace-period-for-DFS-available-after-.patch b/...ace-period-for-DFS-available-after-.patch → ...ace-period-for-DFS-available-after-.patch
diff --git a/...d-AQL-support-for-broadcast-packets.patch → ...d-AQL-support-for-broadcast-packets.patch b/...d-AQL-support-for-broadcast-packets.patch → ...d-AQL-support-for-broadcast-packets.patch
diff --git a/...roduce-EHT-rate-support-in-AQL-airt.patch → ...roduce-EHT-rate-support-in-AQL-airt.patch b/...roduce-EHT-rate-support-in-AQL-airt.patch → ...roduce-EHT-rate-support-in-AQL-airt.patch
diff --git a/package/kernel/mt76/Makefile b/package/kernel/mt76/Makefile
@@ -6,10 +6,12 @@ PKG_RELEASE=1
 PKG_LICENSE:=GPLv2
 PKG_LICENSE_FILES:=
 
+#PKG_SOURCE_URL:=https://github.com/openwrt/mt76
 PKG_SOURCE_URL:=https://github.com/rmandrad/mt76
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_DATE:=2024-09-29
-PKG_SOURCE_VERSION:=680bc70f161fde0f167e2ae50c771be4775eb50a
+#PKG_SOURCE_VERSION:=680bc70f161fde0f167e2ae50c771be4775eb50a
+PKG_SOURCE_VERSION:=6db91bfbc17863f034ca511526ebf7cd85c38858
 PKG_MIRROR_HASH:=bcdb95e40cfceba56a565ad6b6d9f92a122e7230d0f7f950b3d39e4280723cca
 
 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
@@ -41,8 +43,6 @@ define KernelPackage/mt76-default
   DEPENDS:= \
 	+kmod-mac80211 \
 	+@DRIVER_11AC_SUPPORT \
-	+@DRIVER_11AX_SUPPORT \
-	+@DRIVER_11BE_SUPPORT \
 	+@KERNEL_PAGE_POOL
 endef
 
@@ -320,7 +320,7 @@ 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
   FILES:= $(PKG_BUILD_DIR)/mt7996/mt7996e.ko
   AUTOLOAD:=$(call AutoProbe,mt7996e)
 endef
@@ -661,6 +661,7 @@ define KernelPackage/mt7992-firmware/install
 	cp \
 		$(PKG_BUILD_DIR)/firmware/mt7996/mt7992_dsp.bin \
 		$(PKG_BUILD_DIR)/firmware/mt7996/mt7992_eeprom.bin \
+		$(PKG_BUILD_DIR)/firmware/mt7996/mt7992_eeprom_2i5i.bin \
 		$(PKG_BUILD_DIR)/firmware/mt7996/mt7992_rom_patch.bin \
 		$(PKG_BUILD_DIR)/firmware/mt7996/mt7992_wa.bin \
 		$(PKG_BUILD_DIR)/firmware/mt7996/mt7992_wm.bin \
@@ -672,7 +673,7 @@ define KernelPackage/mt7992-23-firmware/install
 	cp \
 		$(PKG_BUILD_DIR)/firmware/mt7996/mt7992_dsp_23.bin \
 		$(PKG_BUILD_DIR)/firmware/mt7996/mt7992_eeprom_23.bin \
-		$(PKG_BUILD_DIR)/firmware/mt7996/mt7992_eeprom_23.bin \
+		$(PKG_BUILD_DIR)/firmware/mt7996/mt7992_eeprom_23_2i5i.bin \
 		$(PKG_BUILD_DIR)/firmware/mt7996/mt7992_rom_patch_23.bin \
 		$(PKG_BUILD_DIR)/firmware/mt7996/mt7992_wa_23.bin \
 		$(PKG_BUILD_DIR)/firmware/mt7996/mt7992_wm_23.bin \

diff --git a/package/network/config/wifi-scripts/files/lib/netifd/wireless/mac80211.sh b/package/network/config/wifi-scripts/files/lib/netifd/wireless/mac80211.sh
@@ -60,7 +60,9 @@ drv_mac80211_init_device_config() {
 		he_twt_required \
 		he_twt_responder \
 		etxbfen \
-		itxbfen
+		itxbfen \
+		lpi_enable \
+		beacon_dup
 	config_add_int \
 		beamformer_antennas \
 		beamformee_antennas \
@@ -71,7 +73,8 @@ drv_mac80211_init_device_config() {
 		rx_stbc \
 		tx_stbc \
 		he_bss_color \
-		he_spr_non_srg_obss_pd_max_offset
+		he_spr_non_srg_obss_pd_max_offset \
+		sku_idx 
 	config_add_boolean \
 		ldpc \
 		greenfield \
@@ -148,7 +151,7 @@ mac80211_hostapd_setup_base() {
 		append base_cfg "acs_exclude_dfs=1" "$N"
 
 	json_get_vars noscan ht_coex min_tx_power:0 tx_burst mbssid mu_onoff rnr obss_interval
-	json_get_vars etxbfen:1 itxbfen:0
+	json_get_vars etxbfen:1 itxbfen:0 lpi_enable:0 sku_idx:0 beacon_dup:1
 	json_get_values ht_capab_list ht_capab
 	json_get_values channel_list channels
 
@@ -576,6 +579,9 @@ mac80211_hostapd_setup_base() {
 		append base_cfg "he_mu_edca_ac_vo_ecwmin=5" "$N"
 		append base_cfg "he_mu_edca_ac_vo_ecwmax=7" "$N"
 		append base_cfg "he_mu_edca_ac_vo_timer=3" "$N"
+        	append base_cfg "he_6ghz_reg_pwr_type=0" "$N"
+        	append base_cfg "stationary_ap=1" "$N"
+
 	fi
 
 	set_default tx_burst 2.0
@@ -601,12 +607,10 @@ mac80211_hostapd_setup_base() {
 					append base_cfg "eht_oper_chwidth=$eht_oper_chwidth" "$N"
 					append base_cfg "eht_oper_centr_freq_seg0_idx=$eht_oper_centr_freq_seg0_idx" "$N"
 					append base_cfg "eht_bw320_offset=$eht_bw320_offset" "$N"
-					append base_cfg "acs_exclude_6ghz_non_psc=1" "$N"
 				;;
 				*)
 					append base_cfg "eht_oper_chwidth=$vht_oper_chwidth" "$N"
 					append base_cfg "eht_oper_centr_freq_seg0_idx=$vht_center_seg0" "$N"
-					append base_cfg "acs_exclude_6ghz_non_psc=1" "$N"
 				;;
 			esac
 		}
@@ -625,6 +629,13 @@ ${mbssid:+mbssid=$mbssid}
 ${rnr:+rnr=$rnr}
 ${multiple_bssid:+mbssid=$multiple_bssid}
 #num_global_macaddr=$num_global_macaddr
+${mbssid:+mbssid=$mbssid}
+${mu_onoff:+mu_onoff=$mu_onoff}
+#${itxbfen:+ibf_enable=$itxbfen}
+#${lpi_enable:+lpi_enable=$lpi_enable}
+#${sku_idx:+sku_idx=$sku_idx}
+#${beacon_dup:+beacon_dup=$beacon_dup}
+${rnr:+rnr=$rnr}
 $base_cfg
 
 EOF