[][MAC80211][mt76][refactor internal patches]
[Description]
Fix mt7986-mac80211 patch fail.
[Release-log]
N/A
Change-Id: I4c43e8e63ec4fce831590dd6edde33d26c2adc50
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/6774656
diff --git a/autobuild_mac80211_release/0001-master-mac80211-generate-hostapd-setting-from-ap-cap.patch b/autobuild_mac80211_release/0001-master-mac80211-generate-hostapd-setting-from-ap-cap.patch
index 121188b..17fab3b 100644
--- a/autobuild_mac80211_release/0001-master-mac80211-generate-hostapd-setting-from-ap-cap.patch
+++ b/autobuild_mac80211_release/0001-master-mac80211-generate-hostapd-setting-from-ap-cap.patch
@@ -1,24 +1,36 @@
+From ed69c1fdd2d70538644460e299d5772a5528f3d9 Mon Sep 17 00:00:00 2001
+From: Peter Chiu <chui-hao.chiu@mediatek.com>
+Date: Mon, 14 Nov 2022 14:44:47 +0800
+Subject: [PATCH] master mac80211 generate hostapd setting from ap cap
+
+Change-Id: I22cef6b7e1a99b1d589270c136a2e74e7a385e79
+---
+ package/kernel/mac80211/Makefile | 3 +++
+ .../files/lib/netifd/wireless/mac80211.sh | 3 ---
+ .../kernel/mac80211/files/lib/wifi/mac80211.sh | 15 ++++++++++++++-
+ 3 files changed, 17 insertions(+), 4 deletions(-)
+
diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile
-index 44428ca..f34286b 100644
+index ec35bf67..ea7bf6e9 100644
--- a/package/kernel/mac80211/Makefile
+++ b/package/kernel/mac80211/Makefile
@@ -19,6 +19,7 @@ PKG_SOURCE:=backports-$(PKG_VERSION).tar.xz
PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/backports-$(PKG_VERSION)
PKG_BUILD_PARALLEL:=1
-
+
+SOURCE_PATH:=./src
PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
-
+
PKG_DRIVERS = \
-@@ -450,6 +451,8 @@ define Build/Prepare
- mkdir -p $(PKG_BUILD_DIR)
- $(PKG_UNPACK)
- $(Build/Patch)
-+ $(CP) ${SOURCE_PATH)/net ${PKG_BUILD_DIR) 2>/dev/null || :
-+ $(CP) ${SOURCE_PATH)/include ${PKG_BUILD_DIR) 2>/dev/null || :
- $(TAR) -C $(PKG_BUILD_DIR) -xzf $(DL_DIR)/$(IPW2100_NAME)-$(IPW2100_VERSION).tgz
- $(TAR) -C $(PKG_BUILD_DIR) -xzf $(DL_DIR)/$(IPW2200_NAME)-$(IPW2200_VERSION).tgz
- $(TAR) -C $(PKG_BUILD_DIR) -xjf $(DL_DIR)/$(ZD1211FW_NAME)-$(ZD1211FW_VERSION).tar.bz2
+@@ -296,6 +297,8 @@ define Build/Prepare
+ mkdir -p $(PKG_BUILD_DIR)
+ $(PKG_UNPACK)
+ $(Build/Patch)
++ $(CP) $(SOURCE_PATH)/net $(PKG_BUILD_DIR) 2>/dev/null || :
++ $(CP) $(SOURCE_PATH)/include $(PKG_BUILD_DIR) 2>/dev/null || :
+ rm -rf \
+ $(PKG_BUILD_DIR)/include/linux/ssb \
+ $(PKG_BUILD_DIR)/include/linux/bcma \
diff --git a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
index ed280521..a0550057 100644
--- a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh