diff --git a/package/ctcgfw/rtl8188eu/Makefile b/package/ctcgfw/rtl8188eu/Makefile index c417461389..9ae74a2121 100644 --- a/package/ctcgfw/rtl8188eu/Makefile +++ b/package/ctcgfw/rtl8188eu/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=rtl8188eu -PKG_RELEASE=1 +PKG_RELEASE:=1 PKG_SOURCE_URL:=https://github.com/aircrack-ng/rtl8188eus.git PKG_SOURCE_PROTO:=git -PKG_SOURCE_DATE:=2020-08-01 -PKG_SOURCE_VERSION:=ae1d233fe6a34a321ca1da2202bec34b1a4b41cd -PKG_MIRROR_HASH:=995d021dec4bef7ce5227239b64aee88ea6d1002464bc7a62cc2ed766607ea89 +PKG_SOURCE_DATE:=2021-02-06 +PKG_SOURCE_VERSION:=1e7145f3237b3eeb3baf775f4a883e6d79c1cfe6 +PKG_MIRROR_HASH:=3f68779aed2b9fabca042ea4effbdf35e25e632a00febe6c3f09646a8c75ee5d PKG_BUILD_PARALLEL:=1 @@ -45,7 +45,8 @@ EXTRA_CFLAGS:= \ -DRTW_SINGLE_WIPHY \ -DRTW_USE_CFG80211_STA_EVENT \ -DCONFIG_IOCTL_CFG80211 \ - -DCONFIG_CONCURRENT_MODE + -DCONFIG_CONCURRENT_MODE \ + -DBUILD_OPENWRT ifeq ($(CONFIG_BIG_ENDIAN),y) EXTRA_CFLAGS += -DCONFIG_BIG_ENDIAN diff --git a/package/ctcgfw/rtl8188eu/patches/030-wireless-5.8.patch b/package/ctcgfw/rtl8188eu/patches/030-wireless-5.8.patch new file mode 100644 index 0000000000..25bc7d0800 --- /dev/null +++ b/package/ctcgfw/rtl8188eu/patches/030-wireless-5.8.patch @@ -0,0 +1,46 @@ +--- a/os_dep/linux/ioctl_cfg80211.c ++++ b/os_dep/linux/ioctl_cfg80211.c +@@ -7094,14 +7094,14 @@ static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy, + #else + struct net_device *ndev, + #endif +-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)) || defined(BUILD_OPENWRT) + struct mgmt_frame_regs *upd) + #else + u16 frame_type, bool reg) + #endif + + { +-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)) || defined(BUILD_OPENWRT) + u32 rtw_mask = BIT(IEEE80211_STYPE_PROBE_REQ >> 4); + #endif + +@@ -7110,7 +7110,7 @@ static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy, + #endif + + /* hardcoded always true, to make it pass compilation */ +-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)) || defined(BUILD_OPENWRT) + bool reg = true; + #endif + +@@ -7137,7 +7137,7 @@ static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy, + /* Wait QC Verify */ + return; + +-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)) || defined(BUILD_OPENWRT) + switch (upd->interface_stypes) { + #else + switch (frame_type) { +@@ -9463,7 +9463,7 @@ static struct cfg80211_ops rtw_cfg80211_ops = { + + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE) + .mgmt_tx = cfg80211_rtw_mgmt_tx, +-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)) || defined(BUILD_OPENWRT) + .update_mgmt_frame_registrations = cfg80211_rtw_mgmt_frame_register, + #else + .mgmt_frame_register = cfg80211_rtw_mgmt_frame_register, diff --git a/package/ctcgfw/rtl8812au-ac/Makefile b/package/ctcgfw/rtl8812au-ac/Makefile index 0ee4851f73..85fceb498a 100644 --- a/package/ctcgfw/rtl8812au-ac/Makefile +++ b/package/ctcgfw/rtl8812au-ac/Makefile @@ -1,5 +1,6 @@ # # Copyright (C) 2020 stepheny +# # # Copyright (C) 2021 ImmortalWrt # @@ -15,9 +16,9 @@ PKG_RELEASE:=1 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:=2021-02-03 +PKG_SOURCE_VERSION:=b65dcf4105641716d16f3a6c96507fdd9c1862b4 +PKG_MIRROR_HASH:=5416d4a6e671c6b07f44f35fae54662baef71f448c4be4ade58bf7fc5ca4f192 PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=LICENSE @@ -32,10 +33,11 @@ include $(INCLUDE_DIR)/package.mk define KernelPackage/rtl8812au-ac SUBMENU:=Wireless Drivers - TITLE:=Realtek rtl8812au/21au wireless drivers + TITLE:=Realtek RTL8812AU/21AU wireless drivers DEPENDS:=+kmod-cfg80211 +kmod-usb-core +@DRIVER_11N_SUPPORT +@DRIVER_11AC_SUPPORT FILES:=$(PKG_BUILD_DIR)/rtl8812au.ko AUTOLOAD:=$(call AutoProbe,rtl8812au) + CONFLICTS:=kmod-rtl8812au-ct endef NOSTDINC_FLAGS = \ @@ -48,26 +50,33 @@ NOSTDINC_FLAGS = \ -include backport/autoconf.h \ -include backport/backport.h -NOSTDINC_FLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT \ - -DRTW_SINGLE_WIPHY -DCONFIG_CONCURRENT_MODE -D_LINUX_BYTEORDER_SWAB_H \ +EXTRA_KCONFIG:= \ + CONFIG_88XXAU=m \ + USER_MODULE_NAME=rtl8812au + +EXTRA_CFLAGS:= \ + -DRTW_SINGLE_WIPHY \ + -DRTW_USE_CFG80211_STA_EVENT \ + -DCONFIG_IOCTL_CFG80211 \ + -DCONFIG_CONCURRENT_MODE \ -DBUILD_OPENWRT -ifeq ($(CONFIG_BIG_ENDIAN), y) -NOSTDINC_FLAGS += -DCONFIG_BIG_ENDIAN -endif -ifeq ($(CONFIG_LITTLE_ENDIAN), y) -NOSTDINC_FLAGS += -DCONFIG_LITTLE_ENDIAN +ifeq ($(CONFIG_BIG_ENDIAN),y) +EXTRA_CFLAGS += -DCONFIG_BIG_ENDIAN +else +EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN endif -PKG_MAKE_FLAGS += USER_MODULE_NAME=rtl8812au -KERNEL_MAKE_FLAGS += CONFIG_88XXAU=m +MAKE_OPTS:= \ + $(KERNEL_MAKE_FLAGS) \ + M="$(PKG_BUILD_DIR)" \ + NOSTDINC_FLAGS="$(NOSTDINC_FLAGS)" \ + USER_EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \ + $(EXTRA_KCONFIG) define Build/Compile +$(MAKE) $(PKG_JOBS) -C "$(LINUX_DIR)" \ - $(KERNEL_MAKE_FLAGS) \ - $(PKG_MAKE_FLAGS) \ - M="$(PKG_BUILD_DIR)" \ - NOSTDINC_FLAGS="$(NOSTDINC_FLAGS)" \ + $(MAKE_OPTS) \ modules endef diff --git a/package/ctcgfw/rtl8812au-ac/patches/0004-Makefile-disable-build-8814au.patch b/package/ctcgfw/rtl8812au-ac/patches/0004-Makefile-disable-build-8814au.patch deleted file mode 100644 index c12e4f88de..0000000000 --- a/package/ctcgfw/rtl8812au-ac/patches/0004-Makefile-disable-build-8814au.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 0f4e46f0fd39f4a18fa01d125284cccaee82ed7b Mon Sep 17 00:00:00 2001 -From: kimocoder -Date: Mon, 19 Oct 2020 05:43:38 +0200 -Subject: [PATCH] Turned 8814au chipset OFF - ---- - Makefile | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/Makefile b/Makefile -index 787b0318..a23673bc 100755 ---- a/Makefile -+++ b/Makefile -@@ -22,7 +22,7 @@ EXTRA_LDFLAGS += --strip-all -O3 - ########################## WIFI IC ############################ - CONFIG_RTL8812A = y - CONFIG_RTL8821A = y --CONFIG_RTL8814A = y -+CONFIG_RTL8814A = n - ######################### Interface ########################### - CONFIG_USB_HCI = y - ########################### Android ########################### -@@ -177,7 +177,7 @@ ifeq ($(CONFIG_USB_HCI), y) - HCI_NAME = usb - endif - --ifeq ($(CONFIG_RTL8812A)_$(CONFIG_RTL8821A)_$(CONFIG_RTL8814A), y_y_y) -+ifeq ($(CONFIG_RTL8812A)_$(CONFIG_RTL8821A)_$(CONFIG_RTL8814A), y_y_n) - - EXTRA_CFLAGS += -DDRV_NAME=\"rtl88XXau\" - ifeq ($(CONFIG_USB_HCI), y) -@@ -456,7 +456,7 @@ ifeq ($(CONFIG_RTL8814A), y) - #EXTRA_CFLAGS += -DCONFIG_MP_VHT_HW_TX_MODE - CONFIG_MP_VHT_HW_TX_MODE = n - ########################################## --RTL871X = rtl8814a -+#RTL871X = rtl8814a - ifeq ($(CONFIG_USB_HCI), y) - MODULE_NAME = 8814au - endif diff --git a/package/ctcgfw/rtl8812au-ac/patches/0005-wireless-5.8.patch b/package/ctcgfw/rtl8812au-ac/patches/0005-wireless-5.8.patch deleted file mode 100644 index b26a605a34..0000000000 --- a/package/ctcgfw/rtl8812au-ac/patches/0005-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-use-kernel-byteorder.patch b/package/ctcgfw/rtl8812au-ac/patches/001-use-kernel-byteorder.patch new file mode 100644 index 0000000000..187a6788ed --- /dev/null +++ b/package/ctcgfw/rtl8812au-ac/patches/001-use-kernel-byteorder.patch @@ -0,0 +1,15 @@ +Fix compile problem when rtw_byteorder.h and asm/byteorder.h gets +included in addition for example indirectly, do not use realtek own copy +of the byteorder headers. + +--- a/include/drv_types.h ++++ b/include/drv_types.h +@@ -24,7 +24,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include diff --git a/package/ctcgfw/rtl8812au-ac/patches/0001-Modify-Makefile-for-openwrt-toolchain.patch b/package/ctcgfw/rtl8812au-ac/patches/010-disable-default-build-x86.patch similarity index 86% rename from package/ctcgfw/rtl8812au-ac/patches/0001-Modify-Makefile-for-openwrt-toolchain.patch rename to package/ctcgfw/rtl8812au-ac/patches/010-disable-default-build-x86.patch index 1a380b88e2..d2621542ee 100644 --- a/package/ctcgfw/rtl8812au-ac/patches/0001-Modify-Makefile-for-openwrt-toolchain.patch +++ b/package/ctcgfw/rtl8812au-ac/patches/010-disable-default-build-x86.patch @@ -1,6 +1,6 @@ --- a/Makefile +++ b/Makefile -@@ -91,7 +91,7 @@ CONFIG_RTW_SDIO_PM_KEEP_POWER = y +@@ -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 ####################### @@ -9,4 +9,3 @@ 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/020-change-value-of-vht-enable-and-usb-mode.patch similarity index 99% 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/020-change-value-of-vht-enable-and-usb-mode.patch index aba8ce7623..8a57356c18 100644 --- a/package/ctcgfw/rtl8812au-ac/patches/0002-Change-default-value-of-vht_enable-switch_usb_mode.patch +++ b/package/ctcgfw/rtl8812au-ac/patches/020-change-value-of-vht-enable-and-usb-mode.patch @@ -2,20 +2,19 @@ +++ 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 */ --- diff --git a/package/ctcgfw/rtl8812au-ac/patches/0003-Add-missing-code-for-concurrent-mode.patch b/package/ctcgfw/rtl8812au-ac/patches/030-add-missing-code-for-concurrent-mode.patch similarity index 100% rename from package/ctcgfw/rtl8812au-ac/patches/0003-Add-missing-code-for-concurrent-mode.patch rename to package/ctcgfw/rtl8812au-ac/patches/030-add-missing-code-for-concurrent-mode.patch diff --git a/package/ctcgfw/rtl8812au-ac/patches/040-wireless-5.8.patch b/package/ctcgfw/rtl8812au-ac/patches/040-wireless-5.8.patch new file mode 100644 index 0000000000..6fb74745d0 --- /dev/null +++ b/package/ctcgfw/rtl8812au-ac/patches/040-wireless-5.8.patch @@ -0,0 +1,20 @@ +--- a/os_dep/linux/ioctl_cfg80211.c ++++ b/os_dep/linux/ioctl_cfg80211.c +@@ -7733,7 +7733,7 @@ exit: + return ret; + } + +-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,8,0)) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,8,0)) || defined(BUILD_OPENWRT) + static void cfg80211_rtw_update_mgmt_frame_register(struct wiphy *wiphy, + struct wireless_dev *wdev, + struct mgmt_frame_regs *upd) +@@ -10185,7 +10185,7 @@ static struct cfg80211_ops rtw_cfg80211_ops = { + + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE) + .mgmt_tx = cfg80211_rtw_mgmt_tx, +-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,8,0)) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,8,0)) || defined(BUILD_OPENWRT) + .update_mgmt_frame_registrations = cfg80211_rtw_update_mgmt_frame_register, + #else + .mgmt_frame_register = cfg80211_rtw_mgmt_frame_register, diff --git a/package/ctcgfw/rtl8821cu/Makefile b/package/ctcgfw/rtl8821cu/Makefile index c2819fe1bd..fed7bf4d41 100644 --- a/package/ctcgfw/rtl8821cu/Makefile +++ b/package/ctcgfw/rtl8821cu/Makefile @@ -13,9 +13,9 @@ PKG_RELEASE:=1 PKG_SOURCE_URL:=https://github.com/brektrou/rtl8821CU.git PKG_SOURCE_PROTO:=git -PKG_SOURCE_DATE:=2020-07-27 -PKG_SOURCE_VERSION:=93b04bfcd293fdd7d98d5a7c964ae9416a40159c -PKG_MIRROR_HASH:=e3d798355625bd71596ce08741e1f7f3523951e91be775edf2a936ab260bd5de +PKG_SOURCE_DATE:=2020-12-19 +PKG_SOURCE_VERSION:=428a0820487418ec69c0edb91726d1cf19763b1e +PKG_MIRROR_HASH:=77958d3bff8b0145504a10959765be0e3743b9c4880a5173d156238c2c569a56 PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=LICENSE @@ -37,10 +37,6 @@ define KernelPackage/rtl8821cu PROVIDES:=kmod-rtl8821cu endef -define KernelPackage/rtl8821cu/description - Realtek RTL8811CU/RTL8821CU USB Wi-Fi adapter driver. -endef - NOSTDINC_FLAGS = \ -I$(PKG_BUILD_DIR) \ -I$(PKG_BUILD_DIR)/include \ @@ -51,7 +47,7 @@ NOSTDINC_FLAGS = \ -include backport/autoconf.h \ -include backport/backport.h -EXTRA_KCONFIG:=\ +EXTRA_KCONFIG:= \ CONFIG_RTL8821CU=m \ USER_MODULE_NAME=rtl8821cu @@ -62,19 +58,14 @@ endif EXTRA_CFLAGS:= \ -DRTW_SINGLE_WIPHY \ -DRTW_USE_CFG80211_STA_EVENT \ - -DCONFIG_RADIO_WORK \ -DCONFIG_IOCTL_CFG80211 \ -DCONFIG_CONCURRENT_MODE \ - -DBUILD_OPENWRT \ + -DBUILD_OPENWRT ifeq ($(ARCH),arm) EXTRA_CFLAGS += -mfloat-abi=softfp endif -ifeq ($(ARCH),x86_64) - EXTRA_CFLAGS += -mhard-float -endif - MAKE_OPTS:= \ $(KERNEL_MAKE_FLAGS) \ M="$(PKG_BUILD_DIR)" \ diff --git a/package/ctcgfw/rtl8821cu/patches/010-remove-extra-cflags.patch b/package/ctcgfw/rtl8821cu/patches/010-remove-extra-cflags.patch index 8d33720aa1..bc753af413 100644 --- a/package/ctcgfw/rtl8821cu/patches/010-remove-extra-cflags.patch +++ b/package/ctcgfw/rtl8821cu/patches/010-remove-extra-cflags.patch @@ -1,18 +1,11 @@ -diff --git a/Makefile b/Makefile -index 6a065bf..6e1c6d0 100755 --- a/Makefile +++ b/Makefile -@@ -1171,13 +1171,6 @@ endif - - ifeq ($(CONFIG_MP_VHT_HW_TX_MODE), y) - EXTRA_CFLAGS += -DCONFIG_MP_VHT_HW_TX_MODE --ifeq ($(CONFIG_PLATFORM_I386_PC), y) --## For I386 X86 ToolChain use Hardware FLOATING --EXTRA_CFLAGS += -mhard-float --else --## For ARM ToolChain use Hardware FLOATING +@@ -2103,8 +2103,6 @@ ifeq ($(ARCH), i386) + EXTRA_CFLAGS += -mhard-float + else ifeq ($(ARCH), x86_64) + EXTRA_CFLAGS += -mhard-float +-else ifeq ($(ARCH), arm) -EXTRA_CFLAGS += -mfloat-abi=hard --endif endif - ####START RASPBERRY PI SUPPORT + ifeq ($(CONFIG_MULTIDRV), y) diff --git a/package/ctcgfw/rtl8821cu/patches/050-change-value-of-vht-enable.patch b/package/ctcgfw/rtl8821cu/patches/030-change-value-of-vht-enable.patch similarity index 100% rename from package/ctcgfw/rtl8821cu/patches/050-change-value-of-vht-enable.patch rename to package/ctcgfw/rtl8821cu/patches/030-change-value-of-vht-enable.patch diff --git a/package/ctcgfw/rtl8821cu/patches/030-fix-build-on-powerpc.patch b/package/ctcgfw/rtl8821cu/patches/030-fix-build-on-powerpc.patch deleted file mode 100644 index d07b4cd9f6..0000000000 --- a/package/ctcgfw/rtl8821cu/patches/030-fix-build-on-powerpc.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/include/byteorder/swab.h b/include/byteorder/swab.h -index a8dd46b..c4b4298 100644 ---- a/include/byteorder/swab.h -+++ b/include/byteorder/swab.h -@@ -104,6 +104,7 @@ __inline static __u64 __arch__swab64(__u64 x) - #define __swab64(x) __fswab64(x) - #endif /* __swab16 */ - -+#ifndef _UAPI_LINUX_SWAB_H - #ifdef PLATFORM_FREEBSD - __inline static __u16 __fswab16(__u16 x) - #else -@@ -120,6 +121,7 @@ __inline static __u64 __arch__swab64(__u64 x) - { - return __arch__swab32(x); - } -+#endif - - #if defined(PLATFORM_LINUX) || defined(PLATFORM_WINDOWS) - #define swab16 __swab16 diff --git a/package/ctcgfw/rtl8821cu/patches/040-wireless-5.x.patch b/package/ctcgfw/rtl8821cu/patches/040-wireless-5.8.patch similarity index 55% rename from package/ctcgfw/rtl8821cu/patches/040-wireless-5.x.patch rename to package/ctcgfw/rtl8821cu/patches/040-wireless-5.8.patch index 1bd1b16c6e..2453c61ff0 100644 --- a/package/ctcgfw/rtl8821cu/patches/040-wireless-5.x.patch +++ b/package/ctcgfw/rtl8821cu/patches/040-wireless-5.8.patch @@ -1,44 +1,36 @@ diff --git a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c -index c0df148..f74c426 100755 +index d9c81c9..3e7e27a 100755 --- a/os_dep/linux/ioctl_cfg80211.c +++ b/os_dep/linux/ioctl_cfg80211.c -@@ -7143,6 +7143,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, -@@ -7186,6 +7194,7 @@ static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy, - exit: +@@ -7149,7 +7149,7 @@ static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy, + #else + struct net_device *ndev, + #endif +-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,8,0)) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,8,0)) || defined(BUILD_OPENWRT) + struct mgmt_frame_regs *upd) + #else + u16 frame_type, bool reg) +@@ -7178,7 +7178,7 @@ static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy, + /* Wait QC Verify */ return; - } -+#endif - #if defined(CONFIG_TDLS) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0)) - static int cfg80211_rtw_tdls_mgmt(struct wiphy *wiphy, -@@ -9457,7 +9466,11 @@ static struct cfg80211_ops rtw_cfg80211_ops = { +-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,8,0)) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,8,0)) || defined(BUILD_OPENWRT) + SET_CFG80211_REPORT_MGMT(pwdev_priv, IEEE80211_STYPE_PROBE_REQ, upd->interface_stypes & BIT(IEEE80211_STYPE_PROBE_REQ >> 4)); + #else + switch (frame_type) { +@@ -9467,7 +9467,7 @@ static struct cfg80211_ops rtw_cfg80211_ops = { #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE) .mgmt_tx = cfg80211_rtw_mgmt_tx, +-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,8,0)) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,8,0)) || defined(BUILD_OPENWRT) -+ .update_mgmt_frame_registrations = cfg80211_rtw_update_mgmt_frame_registrations, -+#else + .update_mgmt_frame_registrations = cfg80211_rtw_mgmt_frame_register, + #else .mgmt_frame_register = cfg80211_rtw_mgmt_frame_register, -+#endif - #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 34) && LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35)) - .action = cfg80211_rtw_mgmt_tx, - #endif diff --git a/os_dep/linux/os_intfs.c b/os_dep/linux/os_intfs.c -index c4b5157..cdb9388 100755 +index 257c581..f97fa24 100755 --- a/os_dep/linux/os_intfs.c +++ b/os_dep/linux/os_intfs.c @@ -1302,6 +1302,14 @@ unsigned int rtw_classify8021d(struct sk_buff *skb) diff --git a/package/ctcgfw/rtl88x2bu/Makefile b/package/ctcgfw/rtl88x2bu/Makefile index e51e718208..e641d04ee6 100644 --- a/package/ctcgfw/rtl88x2bu/Makefile +++ b/package/ctcgfw/rtl88x2bu/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=rtl88x2bu -PKG_RELEASE=1 +PKG_RELEASE:=1 PKG_SOURCE_URL:=https://github.com/cilynx/rtl88x2bu.git PKG_SOURCE_PROTO:=git -PKG_SOURCE_DATE:=2020-07-21 -PKG_SOURCE_VERSION:=a2abcaf523dfab2afeda8cc2cdb5e3c9510fc5f3 -PKG_MIRROR_HASH:=26d5504c9323c9c133265f2c2e4213acca0ddf390b1b4399d1003e9fd45f9368 +PKG_SOURCE_DATE:=2021-01-21 +PKG_SOURCE_VERSION:=48e7c19c92a77554403e1347447f8e2cfd780228 +PKG_MIRROR_HASH:=2991028fb7bd7e31d041b1e99d0e0d86781fff95fc70e4560ca9fcbe038f063f PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=LICENSE diff --git a/package/ctcgfw/rtl88x2bu/patches/010-fix-build-on-powerpc.patch b/package/ctcgfw/rtl88x2bu/patches/010-fix-build-on-powerpc.patch deleted file mode 100644 index d07b4cd9f6..0000000000 --- a/package/ctcgfw/rtl88x2bu/patches/010-fix-build-on-powerpc.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/include/byteorder/swab.h b/include/byteorder/swab.h -index a8dd46b..c4b4298 100644 ---- a/include/byteorder/swab.h -+++ b/include/byteorder/swab.h -@@ -104,6 +104,7 @@ __inline static __u64 __arch__swab64(__u64 x) - #define __swab64(x) __fswab64(x) - #endif /* __swab16 */ - -+#ifndef _UAPI_LINUX_SWAB_H - #ifdef PLATFORM_FREEBSD - __inline static __u16 __fswab16(__u16 x) - #else -@@ -120,6 +121,7 @@ __inline static __u64 __arch__swab64(__u64 x) - { - return __arch__swab32(x); - } -+#endif - - #if defined(PLATFORM_LINUX) || defined(PLATFORM_WINDOWS) - #define swab16 __swab16 diff --git a/package/ctcgfw/rtl88x2bu/patches/020-remove-repeat-flies.patch b/package/ctcgfw/rtl88x2bu/patches/010-remove-repeat-flies.patch similarity index 100% rename from package/ctcgfw/rtl88x2bu/patches/020-remove-repeat-flies.patch rename to package/ctcgfw/rtl88x2bu/patches/010-remove-repeat-flies.patch diff --git a/package/ctcgfw/rtl88x2bu/patches/020-wireless-5.8.patch b/package/ctcgfw/rtl88x2bu/patches/020-wireless-5.8.patch new file mode 100644 index 0000000000..96b1d956ce --- /dev/null +++ b/package/ctcgfw/rtl88x2bu/patches/020-wireless-5.8.patch @@ -0,0 +1,38 @@ +--- a/os_dep/linux/ioctl_cfg80211.c ++++ b/os_dep/linux/ioctl_cfg80211.c +@@ -7325,7 +7325,7 @@ exit: + return ret; + } + +-#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)) ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)) && !defined(BUILD_OPENWRT) + + static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy, + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)) +@@ -7341,7 +7341,7 @@ static void cfg80211_rtw_update_mgmt_frame_register(struct wiphy *wiphy, + struct mgmt_frame_regs *upd) + #endif + { +-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)) || defined(BUILD_OPENWRT) + u32 rtw_mask = BIT(IEEE80211_STYPE_PROBE_REQ >> 4); + #endif + +@@ -7371,7 +7371,7 @@ static void cfg80211_rtw_update_mgmt_frame_register(struct wiphy *wiphy, + /* Wait QC Verify */ + return; + +-#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)) ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)) && !defined(BUILD_OPENWRT) + switch (frame_type) { + case IEEE80211_STYPE_PROBE_REQ: /* 0x0040 */ + SET_CFG80211_REPORT_MGMT(pwdev_priv, IEEE80211_STYPE_PROBE_REQ, reg); +@@ -9672,7 +9672,7 @@ static struct cfg80211_ops rtw_cfg80211_ops = { + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE) + .mgmt_tx = cfg80211_rtw_mgmt_tx, + +-#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)) ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)) && !defined(BUILD_OPENWRT) + .mgmt_frame_register = cfg80211_rtw_mgmt_frame_register, + #else + .update_mgmt_frame_registrations = diff --git a/package/ctcgfw/rtl88x2bu/patches/030-wireless-5.8.patch b/package/ctcgfw/rtl88x2bu/patches/030-wireless-5.8.patch deleted file mode 100644 index 686e5d5a09..0000000000 --- a/package/ctcgfw/rtl88x2bu/patches/030-wireless-5.8.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c -index 2fd4e28..6fc93ea 100755 ---- a/os_dep/linux/ioctl_cfg80211.c -+++ b/os_dep/linux/ioctl_cfg80211.c -@@ -7325,6 +7325,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, -@@ -7368,6 +7376,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, -@@ -9652,7 +9661,11 @@ static struct cfg80211_ops rtw_cfg80211_ops = { - - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE) - .mgmt_tx = cfg80211_rtw_mgmt_tx, -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,8,0)) || defined(BUILD_OPENWRT) -+ .update_mgmt_frame_registrations = cfg80211_rtw_update_mgmt_frame_registrations, -+#else - .mgmt_frame_register = cfg80211_rtw_mgmt_frame_register, -+#endif - #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 34) && LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35)) - .action = cfg80211_rtw_mgmt_tx, - #endif diff --git a/package/ntlf9t/rtl8192du/Makefile b/package/ntlf9t/rtl8192du/Makefile index 45e02c3194..7195cd5a8a 100644 --- a/package/ntlf9t/rtl8192du/Makefile +++ b/package/ntlf9t/rtl8192du/Makefile @@ -12,9 +12,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/lwfinger/rtl8192du -PKG_SOURCE_DATE:=2019-06-01 -PKG_SOURCE_VERSION:=54c95aaa23fe332afaa1ed4aacbb0db43aa3c7dd -PKG_MIRROR_HASH:=d7cee3b7e8601c8e850570401628128f595faa4ad2895237708ba0e58bee3020 +PKG_SOURCE_DATE:=2020-12-12 +PKG_SOURCE_VERSION:=331ec03d89d0c0ebe771c4011846f029f6af33d3 +PKG_MIRROR_HASH:=f0acb833dd51cde41b982be3d341356548c7454d33afecbd25b2e03dea6d53b0 PKG_BUILD_PARALLEL:=1 PKG_MAINTAINER:=Larry Finger diff --git a/package/ntlf9t/rtl8192du/patches/010-wireless-5.8.patch b/package/ntlf9t/rtl8192du/patches/020-wireless-5.8.patch similarity index 55% rename from package/ntlf9t/rtl8192du/patches/010-wireless-5.8.patch rename to package/ntlf9t/rtl8192du/patches/020-wireless-5.8.patch index 07f94bec49..1c89277008 100644 --- a/package/ntlf9t/rtl8192du/patches/010-wireless-5.8.patch +++ b/package/ntlf9t/rtl8192du/patches/020-wireless-5.8.patch @@ -1,29 +1,20 @@ --- a/os_dep/ioctl_cfg80211.c +++ b/os_dep/ioctl_cfg80211.c -@@ -4941,7 +4941,14 @@ exit: +@@ -4941,7 +4941,7 @@ exit: return ret; } -#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0) -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)) || defined(BUILD_OPENWRT) -+static void cfg80211_rtw_update_mgmt_frame_register(struct wiphy *wiphy, -+ struct wireless_dev *wdev, -+ struct mgmt_frame_regs *upd) -+{ -+ -+} -+#else ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0) && !defined(BUILD_OPENWRT) static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy, #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)) struct wireless_dev *wdev, -@@ -5355,7 +5362,9 @@ static struct cfg80211_ops rtw_cfg80211_ops = { +@@ -5355,7 +5355,7 @@ static struct cfg80211_ops rtw_cfg80211_ops = { #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE) .mgmt_tx = cfg80211_rtw_mgmt_tx, -#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0) -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)) || defined(BUILD_OPENWRT) -+ .update_mgmt_frame_registrations = cfg80211_rtw_update_mgmt_frame_register, -+#else ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0) && !defined(BUILD_OPENWRT) .mgmt_frame_register = cfg80211_rtw_mgmt_frame_register, #endif #elif (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,34) && LINUX_VERSION_CODE<=KERNEL_VERSION(2,6,35))