[][mac80211][misc][fix patch fail due to openwrt update]
[Description]
Fix patch fail due to openwrt update
[Release-log]
N/A
Change-Id: I1fa5d1937d257cb8507d03c327d993d0d83ba088
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/9708068
diff --git a/autobuild/autobuild_5.4_mac80211_release/0003-wifi7-mt76-makefile-for-new-chip.patch b/autobuild/autobuild_5.4_mac80211_release/0003-wifi7-mt76-makefile-for-new-chip.patch
index c3ba172..c742e46 100644
--- a/autobuild/autobuild_5.4_mac80211_release/0003-wifi7-mt76-makefile-for-new-chip.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/0003-wifi7-mt76-makefile-for-new-chip.patch
@@ -1,5 +1,5 @@
diff --git a/package/kernel/mt76/Makefile b/package/kernel/mt76/Makefile
-index 9a7c1f85..b361c166 100644
+index 8c3bf3e7..b361c166 100644
--- a/package/kernel/mt76/Makefile
+++ b/package/kernel/mt76/Makefile
@@ -233,7 +233,7 @@ endef
@@ -27,18 +27,19 @@
TITLE:=MediaTek MT7986 firmware
endef
-@@ -317,8 +317,8 @@ endef
+@@ -317,9 +317,8 @@ endef
define KernelPackage/mt7996e
$(KernelPackage/mt76-default)
- TITLE:=MediaTek MT7996E wireless driver
-- DEPENDS+=@PCI_SUPPORT +kmod-mt76-connac +kmod-hwmon-core +@DRIVER_11AX_SUPPORT +@KERNEL_RELAY
+- DEPENDS+=@PCI_SUPPORT +kmod-mt76-connac +kmod-hwmon-core +@DRIVER_11AX_SUPPORT \
+- +@KERNEL_RELAY +@DRIVER_11BE_SUPPORT
+ TITLE:=MediaTek MT7996/MT7995/MT7919 wireless driver
+ DEPENDS+=@PCI_SUPPORT +kmod-mt76-core +kmod-mt76-connac +kmod-hwmon-core +kmod-thermal +@DRIVER_11AX_SUPPORT +@DRIVER_11BE_SUPPORT +@KERNEL_RELAY
FILES:= $(PKG_BUILD_DIR)/mt7996/mt7996e.ko
AUTOLOAD:=$(call AutoProbe,mt7996e)
endef
-@@ -359,6 +359,12 @@ define KernelPackage/mt7925-firmware
+@@ -360,6 +359,12 @@ define KernelPackage/mt7925-firmware
DEPENDS+=+kmod-mt7925e
endef
@@ -51,7 +52,7 @@
define KernelPackage/mt7925-common
$(KernelPackage/mt76-default)
TITLE:=MediaTek MT7925 wireless driver common code
-@@ -406,6 +412,11 @@ ifdef CONFIG_PACKAGE_MAC80211_MESH
+@@ -407,6 +412,11 @@ ifdef CONFIG_PACKAGE_MAC80211_MESH
NOSTDINC_FLAGS += -DCONFIG_MAC80211_MESH
endif
@@ -63,7 +64,7 @@
ifdef CONFIG_PACKAGE_CFG80211_TESTMODE
NOSTDINC_FLAGS += -DCONFIG_NL80211_TESTMODE
PKG_MAKE_FLAGS += CONFIG_NL80211_TESTMODE=y
-@@ -468,7 +479,11 @@ ifdef CONFIG_PACKAGE_kmod-mt7663u
+@@ -469,7 +479,11 @@ ifdef CONFIG_PACKAGE_kmod-mt7663u
endif
ifdef CONFIG_PACKAGE_kmod-mt7915e
PKG_MAKE_FLAGS += CONFIG_MT7915E=m
@@ -76,7 +77,7 @@
PKG_MAKE_FLAGS += CONFIG_MT798X_WMAC=y
NOSTDINC_FLAGS += -DCONFIG_MT798X_WMAC
endif
-@@ -505,7 +520,8 @@ ifdef CONFIG_PACKAGE_kmod-mt7925e
+@@ -506,7 +520,8 @@ ifdef CONFIG_PACKAGE_kmod-mt7925e
endif
define Build/Compile
@@ -86,7 +87,7 @@
$(PKG_MAKE_FLAGS) \
M="$(PKG_BUILD_DIR)" \
NOSTDINC_FLAGS="$(NOSTDINC_FLAGS)" \
-@@ -598,6 +614,8 @@ define KernelPackage/mt7915-firmware/install
+@@ -599,6 +614,8 @@ define KernelPackage/mt7915-firmware/install
$(PKG_BUILD_DIR)/firmware/mt7915_wa.bin \
$(PKG_BUILD_DIR)/firmware/mt7915_wm.bin \
$(PKG_BUILD_DIR)/firmware/mt7915_rom_patch.bin \
@@ -95,7 +96,7 @@
$(1)/lib/firmware/mediatek
endef
-@@ -607,6 +625,7 @@ define KernelPackage/mt7916-firmware/install
+@@ -608,6 +625,7 @@ define KernelPackage/mt7916-firmware/install
$(PKG_BUILD_DIR)/firmware/mt7916_wa.bin \
$(PKG_BUILD_DIR)/firmware/mt7916_wm.bin \
$(PKG_BUILD_DIR)/firmware/mt7916_rom_patch.bin \
@@ -103,7 +104,7 @@
$(1)/lib/firmware/mediatek
endef
-@@ -616,7 +635,13 @@ define KernelPackage/mt7981-firmware/install
+@@ -617,7 +635,13 @@ define KernelPackage/mt7981-firmware/install
$(PKG_BUILD_DIR)/firmware/mt7981_wa.bin \
$(PKG_BUILD_DIR)/firmware/mt7981_wm.bin \
$(PKG_BUILD_DIR)/firmware/mt7981_rom_patch.bin \
@@ -117,7 +118,7 @@
endef
define KernelPackage/mt7986-firmware/install
-@@ -627,7 +652,18 @@ define KernelPackage/mt7986-firmware/install
+@@ -628,7 +652,18 @@ define KernelPackage/mt7986-firmware/install
$(PKG_BUILD_DIR)/firmware/mt7986_wm.bin \
$(PKG_BUILD_DIR)/firmware/mt7986_rom_patch_mt7975.bin \
$(PKG_BUILD_DIR)/firmware/mt7986_rom_patch.bin \
@@ -136,7 +137,7 @@
endef
define KernelPackage/mt7921-firmware/install
-@@ -663,6 +699,9 @@ define KernelPackage/mt7992-firmware/install
+@@ -664,6 +699,9 @@ define KernelPackage/mt7992-firmware/install
$(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 \
@@ -146,7 +147,7 @@
$(1)/lib/firmware/mediatek/mt7996
endef
-@@ -675,6 +714,7 @@ define KernelPackage/mt7992-23-firmware/install
+@@ -676,6 +714,7 @@ define KernelPackage/mt7992-23-firmware/install
$(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 \
@@ -154,7 +155,7 @@
$(1)/lib/firmware/mediatek/mt7996
endef
-@@ -690,9 +730,11 @@ define KernelPackage/mt7996-firmware/install
+@@ -691,9 +730,11 @@ define KernelPackage/mt7996-firmware/install
cp \
$(PKG_BUILD_DIR)/firmware/mt7996/mt7996_eeprom.bin \
$(PKG_BUILD_DIR)/firmware/mt7996/mt7996_eeprom_2i5i6i.bin \
@@ -166,7 +167,7 @@
$(1)/lib/firmware/mediatek/mt7996
endef
-@@ -704,9 +746,21 @@ define KernelPackage/mt7996-233-firmware/install
+@@ -705,9 +746,21 @@ define KernelPackage/mt7996-233-firmware/install
$(PKG_BUILD_DIR)/firmware/mt7996/mt7996_rom_patch_233.bin \
$(PKG_BUILD_DIR)/firmware/mt7996/mt7996_wa_233.bin \
$(PKG_BUILD_DIR)/firmware/mt7996/mt7996_wm_233.bin \
@@ -188,7 +189,7 @@
define Package/mt76-test/install
mkdir -p $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/tools/mt76-test $(1)/usr/sbin
-@@ -762,5 +816,6 @@ $(eval $(call KernelPackage,mt7992-23-firmware))
+@@ -763,5 +816,6 @@ $(eval $(call KernelPackage,mt7992-23-firmware))
$(eval $(call KernelPackage,mt7996-firmware-common))
$(eval $(call KernelPackage,mt7996-firmware))
$(eval $(call KernelPackage,mt7996-233-firmware))
diff --git a/autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/hostapd/0003-hostapd-add-EHT-config.patch b/autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/hostapd/0003-hostapd-add-EHT-config.patch
deleted file mode 100644
index b5ce675..0000000
--- a/autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/hostapd/0003-hostapd-add-EHT-config.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/package/network/services/hostapd/Config.in b/package/network/services/hostapd/Config.in
-index 1fff4f8..742cd78 100644
---- a/package/network/services/hostapd/Config.in
-+++ b/package/network/services/hostapd/Config.in
-@@ -40,6 +40,10 @@ config DRIVER_11AX_SUPPORT
- default n
- select WPA_MBO_SUPPORT
-
-+config DRIVER_11BE_SUPPORT
-+ bool
-+ default n
-+
- config WPA_ENABLE_WEP
- bool "Enable support for unsecure and obsolete WEP"
- depends on PACKAGE_hostapd-common
-diff --git a/package/network/services/hostapd/Makefile b/package/network/services/hostapd/Makefile
-index 263c5d2..9692c23 100644
---- a/package/network/services/hostapd/Makefile
-+++ b/package/network/services/hostapd/Makefile
-@@ -27,6 +27,7 @@ PKG_CONFIG_DEPENDS:= \
- CONFIG_WPA_RFKILL_SUPPORT \
- CONFIG_DRIVER_11AC_SUPPORT \
- CONFIG_DRIVER_11AX_SUPPORT \
-+ CONFIG_DRIVER_11BE_SUPPORT \
- CONFIG_WPA_ENABLE_WEP
-
- PKG_BUILD_FLAGS:=gc-sections lto
-@@ -79,6 +80,10 @@ ifneq ($(CONFIG_DRIVER_11AX_SUPPORT),)
- HOSTAPD_IEEE80211AX:=y
- endif
-
-+ifneq ($(CONFIG_DRIVER_11BE_SUPPORT),)
-+ HOSTAPD_IEEE80211BE:=y
-+endif
-+
- CORE_DEPENDS = +ucode +libubus +libucode +ucode-mod-fs +ucode-mod-nl80211 +ucode-mod-rtnl +ucode-mod-ubus +ucode-mod-uloop +libblobmsg-json +libudebug
- OPENSSL_DEPENDS = +PACKAGE_$(1):libopenssl
-
-@@ -86,6 +91,7 @@ DRIVER_MAKEOPTS= \
- CONFIG_ACS=y CONFIG_DRIVER_NL80211=y \
- CONFIG_IEEE80211AC=$(HOSTAPD_IEEE80211AC) \
- CONFIG_IEEE80211AX=$(HOSTAPD_IEEE80211AX) \
-+ CONFIG_IEEE80211BE=$(HOSTAPD_IEEE80211BE) \
- CONFIG_MBO=$(CONFIG_WPA_MBO_SUPPORT) \
- CONFIG_UCODE=y CONFIG_APUP=y
-