From 5e11ff51d2441a063a30dba571a64d4e9b6b76a1 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Sun, 6 Dec 2020 03:08:35 +0800 Subject: [PATCH] rtl8812au-ac: bump to latest git HEAD --- package/ctcgfw/rtl8812au-ac/Makefile | 6 +-- ...odify-Makefile-for-openwrt-toolchain.patch | 12 ------ .../patches/0003-wireless-5.8.patch | 37 ------------------- .../001-modify-makefile-for-openwrt.patch | 21 +++++++++++ ...value-of-vht_enable-switch_usb_mode.patch} | 19 +++++++--- 5 files changed, 38 insertions(+), 57 deletions(-) delete mode 100644 package/ctcgfw/rtl8812au-ac/patches/0001-Modify-Makefile-for-openwrt-toolchain.patch delete mode 100644 package/ctcgfw/rtl8812au-ac/patches/0003-wireless-5.8.patch create mode 100644 package/ctcgfw/rtl8812au-ac/patches/001-modify-makefile-for-openwrt.patch rename package/ctcgfw/rtl8812au-ac/patches/{0002-Change-default-value-of-vht_enable-switch_usb_mode.patch => 002-Change-default-value-of-vht_enable-switch_usb_mode.patch} (72%) diff --git a/package/ctcgfw/rtl8812au-ac/Makefile b/package/ctcgfw/rtl8812au-ac/Makefile index 35191f0e14..903a78c548 100644 --- a/package/ctcgfw/rtl8812au-ac/Makefile +++ b/package/ctcgfw/rtl8812au-ac/Makefile @@ -8,9 +8,9 @@ PKG_LICENSE_FILES:= PKG_SOURCE_URL:=https://github.com/aircrack-ng/rtl8812au.git PKG_SOURCE_PROTO:=git -PKG_SOURCE_DATE:=2020-06-26 -PKG_SOURCE_VERSION:=58f6be25f7c86d7ba67b0ccc638cf667755e6e1b -PKG_MIRROR_HASH:=60359df8b49fa433d38b968b0df7eaddaca10f13cdd57471394bac1f6e5a162e +PKG_SOURCE_DATE:=2020-10-16 +PKG_SOURCE_VERSION:=958bb8da98601ae179c202de2bbcdda89fa42986 +PKG_MIRROR_HASH:=de49a4dc9f7668409cfdc8b3b77d300615203c8f152f4535eea1ed6f2febc500 # PKG_MAINTAINER:= PKG_BUILD_PARALLEL:=1 diff --git a/package/ctcgfw/rtl8812au-ac/patches/0001-Modify-Makefile-for-openwrt-toolchain.patch b/package/ctcgfw/rtl8812au-ac/patches/0001-Modify-Makefile-for-openwrt-toolchain.patch deleted file mode 100644 index 1a380b88e2..0000000000 --- a/package/ctcgfw/rtl8812au-ac/patches/0001-Modify-Makefile-for-openwrt-toolchain.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -91,7 +91,7 @@ CONFIG_RTW_SDIO_PM_KEEP_POWER = y - ###################### MP HW TX MODE FOR VHT ####################### - CONFIG_MP_VHT_HW_TX_MODE = n - ###################### Platform Related ####################### --CONFIG_PLATFORM_I386_PC = y -+CONFIG_PLATFORM_I386_PC = n - CONFIG_PLATFORM_ANDROID_ARM64 = n - CONFIG_PLATFORM_ARM_RPI = n - CONFIG_PLATFORM_ARM64_RPI = n --- diff --git a/package/ctcgfw/rtl8812au-ac/patches/0003-wireless-5.8.patch b/package/ctcgfw/rtl8812au-ac/patches/0003-wireless-5.8.patch deleted file mode 100644 index b26a605a34..0000000000 --- a/package/ctcgfw/rtl8812au-ac/patches/0003-wireless-5.8.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- a/os_dep/linux/ioctl_cfg80211.c -+++ b/os_dep/linux/ioctl_cfg80211.c -@@ -7597,6 +7597,14 @@ exit: - return ret; - } - -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)) || defined(BUILD_OPENWRT) -+static void cfg80211_rtw_update_mgmt_frame_registrations(struct wiphy *wiphy, -+ struct wireless_dev *wdev, -+ struct mgmt_frame_regs *upd) -+{ -+ -+} -+#else - static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy, - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)) - struct wireless_dev *wdev, -@@ -7651,6 +7659,7 @@ static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy, - exit: - return; - } -+#endif - - #if defined(CONFIG_TDLS) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0)) - static int cfg80211_rtw_tdls_mgmt(struct wiphy *wiphy, -@@ -10067,7 +10076,10 @@ static struct cfg80211_ops rtw_cfg80211_ops = { - .update_ft_ies = cfg80211_rtw_update_ft_ies, - #endif - --#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE) -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,8,0)) || defined(BUILD_OPENWRT) -+ .mgmt_tx = cfg80211_rtw_mgmt_tx, -+ .update_mgmt_frame_registrations = cfg80211_rtw_update_mgmt_frame_registrations, -+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE) - .mgmt_tx = cfg80211_rtw_mgmt_tx, - .mgmt_frame_register = cfg80211_rtw_mgmt_frame_register, - #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 34) && LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35)) diff --git a/package/ctcgfw/rtl8812au-ac/patches/001-modify-makefile-for-openwrt.patch b/package/ctcgfw/rtl8812au-ac/patches/001-modify-makefile-for-openwrt.patch new file mode 100644 index 0000000000..3e3ce9ce3c --- /dev/null +++ b/package/ctcgfw/rtl8812au-ac/patches/001-modify-makefile-for-openwrt.patch @@ -0,0 +1,21 @@ +From de2039cd917ff382d8499f6c2eabaeed48b0b8d9 Mon Sep 17 00:00:00 2001 +From: Marty Jones +Date: Sat, 14 Nov 2020 03:26:35 -0500 +Subject: [PATCH] modify makefile for openwrt + +Signed-off-by: Marty Jones +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/Makefile ++++ b/Makefile +@@ -92,7 +92,7 @@ CONFIG_RTW_SDIO_PM_KEEP_POWER = y + ###################### MP HW TX MODE FOR VHT ####################### + CONFIG_MP_VHT_HW_TX_MODE = n + ###################### Platform Related ####################### +-CONFIG_PLATFORM_I386_PC = y ++CONFIG_PLATFORM_I386_PC = n + CONFIG_PLATFORM_ANDROID_ARM64 = n + CONFIG_PLATFORM_ARM_RPI = n + CONFIG_PLATFORM_ARM64_RPI = n diff --git a/package/ctcgfw/rtl8812au-ac/patches/0002-Change-default-value-of-vht_enable-switch_usb_mode.patch b/package/ctcgfw/rtl8812au-ac/patches/002-Change-default-value-of-vht_enable-switch_usb_mode.patch similarity index 72% rename from package/ctcgfw/rtl8812au-ac/patches/0002-Change-default-value-of-vht_enable-switch_usb_mode.patch rename to package/ctcgfw/rtl8812au-ac/patches/002-Change-default-value-of-vht_enable-switch_usb_mode.patch index aba8ce7623..79e4e13d06 100644 --- a/package/ctcgfw/rtl8812au-ac/patches/0002-Change-default-value-of-vht_enable-switch_usb_mode.patch +++ b/package/ctcgfw/rtl8812au-ac/patches/002-Change-default-value-of-vht_enable-switch_usb_mode.patch @@ -1,21 +1,30 @@ +From 507fba781c211ea33049adea06d3df2c62c391e0 Mon Sep 17 00:00:00 2001 +From: Marty Jones +Date: Sat, 14 Nov 2020 03:21:33 -0500 +Subject: [PATCH] dhange default value + +Signed-off-by: Marty Jones +--- + os_dep/linux/os_intfs.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + --- a/os_dep/linux/os_intfs.c +++ b/os_dep/linux/os_intfs.c @@ -254,7 +254,7 @@ int rtw_bfee_rf_number = 0; /*BeamformeeCapRfNum Rf path number, 0 for auto, ot #endif /* CONFIG_80211N_HT */ - + #ifdef CONFIG_80211AC_VHT -int rtw_vht_enable = 1; /* 0:disable, 1:enable, 2:force auto enable */ +int rtw_vht_enable = 2; /* 0:disable, 1:enable, 2:force auto enable */ module_param(rtw_vht_enable, int, 0644); - + int rtw_ampdu_factor = 7; @@ -324,7 +324,7 @@ int rtw_drv_ant_band_switch = 1; /* 0:OFF , 1:ON, Driver control antenna band sw int rtw_single_ant_path; /*0:main ant , 1:aux ant , Fixed single antenna path, default main ant*/ - + /* 0: doesn't switch, 1: switch from usb2.0 to usb 3.0 2: switch from usb3.0 to usb 2.0 */ -int rtw_switch_usb_mode = 0; +int rtw_switch_usb_mode = 1; - + #ifdef CONFIG_USB_AUTOSUSPEND int rtw_enusbss = 1;/* 0:disable,1:enable */ ---