diff --git a/package/kernel/rtl8812au-ac/Makefile b/package/kernel/rtl8812au-ac/Makefile deleted file mode 100644 index dfe1764d0..000000000 --- a/package/kernel/rtl8812au-ac/Makefile +++ /dev/null @@ -1,70 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only -# -# Copyright (C) 2020 stepheny -# -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=rtl8812au-ac -PKG_RELEASE:=1 - -PKG_SOURCE_URL:=https://github.com/aircrack-ng/rtl8812au.git -PKG_SOURCE_PROTO:=git -PKG_SOURCE_DATE:=2024-05-10 -PKG_SOURCE_VERSION:=b44d288f423ede0fc7cdbf92d07a7772cd727de4 -PKG_MIRROR_HASH:=dd27206739be50517dff9fccca6724b5aae6e7b4d9fa06bddfc9bdacc325b25b - -PKG_LICENSE:=GPL-2.0-only -PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINER:=Marty Jones - -PKG_BUILD_PARALLEL:=1 - -STAMP_CONFIGURED_DEPENDS := $(STAGING_DIR)/usr/include/mac80211-backport/backport/autoconf.h - -include $(INCLUDE_DIR)/kernel.mk -include $(INCLUDE_DIR)/package.mk - -define KernelPackage/rtl8812au-ac - SUBMENU:=Wireless Drivers - TITLE:=Realtek RTL8812AU/21AU wireless drivers - DEPENDS:=@!(LINUX_6_6) +kmod-cfg80211 +kmod-usb-core +@DRIVER_11AC_SUPPORT - FILES:=$(PKG_BUILD_DIR)/rtl8812au.ko - AUTOLOAD:=$(call AutoProbe,rtl8812au) - CONFLICTS:=kmod-rtl8812au-ct -endef - -NOSTDINC_FLAGS:= \ - $(KERNEL_NOSTDINC_FLAGS) \ - -I$(PKG_BUILD_DIR) \ - -I$(PKG_BUILD_DIR)/include \ - -I$(STAGING_DIR)/usr/include/mac80211-backport \ - -I$(STAGING_DIR)/usr/include/mac80211-backport/uapi \ - -I$(STAGING_DIR)/usr/include/mac80211 \ - -I$(STAGING_DIR)/usr/include/mac80211/uapi \ - -include backport/autoconf.h \ - -include backport/backport.h - -NOSTDINC_FLAGS+= \ - -DRTW_SINGLE_WIPHY \ - -DRTW_USE_CFG80211_STA_EVENT \ - -DCONFIG_IOCTL_CFG80211 \ - -DBUILD_OPENWRT - -ifeq ($(CONFIG_BIG_ENDIAN),y) -NOSTDINC_FLAGS+= -DCONFIG_BIG_ENDIAN -else -NOSTDINC_FLAGS+= -DCONFIG_LITTLE_ENDIAN -endif - -define Build/Compile - +$(KERNEL_MAKE) $(PKG_JOBS) \ - M="$(PKG_BUILD_DIR)" \ - NOSTDINC_FLAGS="$(NOSTDINC_FLAGS)" \ - CONFIG_88XXAU=m \ - USER_MODULE_NAME=rtl8812au \ - modules -endef - -$(eval $(call KernelPackage,rtl8812au-ac)) diff --git a/package/kernel/rtl8812au-ac/patches/001-use-kernel-byteorder.patch b/package/kernel/rtl8812au-ac/patches/001-use-kernel-byteorder.patch deleted file mode 100644 index 187a6788e..000000000 --- a/package/kernel/rtl8812au-ac/patches/001-use-kernel-byteorder.patch +++ /dev/null @@ -1,15 +0,0 @@ -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/kernel/rtl8812au-ac/patches/010-disable-default-build-x86.patch b/package/kernel/rtl8812au-ac/patches/010-disable-default-build-x86.patch deleted file mode 100644 index 6856138d8..000000000 --- a/package/kernel/rtl8812au-ac/patches/010-disable-default-build-x86.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -97,7 +97,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/kernel/rtl8812au-ac/patches/020-change-value-of-vht-enable-and-usb-mode.patch b/package/kernel/rtl8812au-ac/patches/020-change-value-of-vht-enable-and-usb-mode.patch deleted file mode 100644 index 44fed1c2a..000000000 --- a/package/kernel/rtl8812au-ac/patches/020-change-value-of-vht-enable-and-usb-mode.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/os_dep/linux/os_intfs.c -+++ b/os_dep/linux/os_intfs.c -@@ -258,7 +258,7 @@ int rtw_bfee_rf_number = 0; /*Beamformee - #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; -@@ -328,7 +328,7 @@ int rtw_drv_ant_band_switch = 1; /* 0:OF - 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/kernel/rtl8812au-ac/patches/030-add-missing-code-for-concurrent-mode.patch b/package/kernel/rtl8812au-ac/patches/030-add-missing-code-for-concurrent-mode.patch deleted file mode 100644 index fb44f9ec2..000000000 --- a/package/kernel/rtl8812au-ac/patches/030-add-missing-code-for-concurrent-mode.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/os_dep/linux/os_intfs.c -+++ b/os_dep/linux/os_intfs.c -@@ -2782,6 +2782,7 @@ static int netdev_vir_if_close(struct ne - { - _adapter *padapter = (_adapter *)rtw_netdev_priv(pnetdev); - struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ struct wireless_dev *wdev = padapter->rtw_wdev; - - RTW_INFO(FUNC_NDEV_FMT" , bup=%d\n", FUNC_NDEV_ARG(pnetdev), padapter->bup); - padapter->net_closed = _TRUE; diff --git a/package/kernel/rtl8812au-ac/patches/040-wireless-5.8.patch b/package/kernel/rtl8812au-ac/patches/040-wireless-5.8.patch deleted file mode 100644 index c31b78bb9..000000000 --- a/package/kernel/rtl8812au-ac/patches/040-wireless-5.8.patch +++ /dev/null @@ -1,142 +0,0 @@ ---- a/os_dep/linux/ioctl_cfg80211.c -+++ b/os_dep/linux/ioctl_cfg80211.c -@@ -460,9 +460,9 @@ u8 rtw_cfg80211_ch_switch_notify(_adapte - - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0)) - if (started) { --#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(6, 9, 0)) -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(6, 9, 0)) && !defined(BUILD_OPENWRT) - cfg80211_ch_switch_started_notify(adapter->pnetdev, &chdef, 0, 0, false, 0); --#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) -+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) || defined(BUILD_OPENWRT) - cfg80211_ch_switch_started_notify(adapter->pnetdev, &chdef, 0, 0, false); - #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 11, 0)) || (RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(8,0)) - cfg80211_ch_switch_started_notify(adapter->pnetdev, &chdef, 0, false); -@@ -476,9 +476,9 @@ u8 rtw_cfg80211_ch_switch_notify(_adapte - if (!rtw_cfg80211_allow_ch_switch_notify(adapter)) - goto exit; - --#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(6, 9, 0)) -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(6, 9, 0)) && !defined(BUILD_OPENWRT) - cfg80211_ch_switch_notify(adapter->pnetdev, &chdef, 0, 0); --#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 2)) -+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 2)) || defined(BUILD_OPENWRT) - cfg80211_ch_switch_notify(adapter->pnetdev, &chdef, 0); - #else - cfg80211_ch_switch_notify(adapter->pnetdev, &chdef); -@@ -1155,7 +1155,7 @@ check_bss: - #endif - - #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) -- #if LINUX_VERSION_CODE < KERNEL_VERSION(6, 0, 0) -+ #if LINUX_VERSION_CODE < KERNEL_VERSION(6, 0, 0) && !defined(BUILD_OPENWRT) - roam_info.channel = notify_channel; - roam_info.bssid = cur_network->network.MacAddress; - #endif -@@ -1738,7 +1738,7 @@ exit: - } - - static int cfg80211_rtw_add_key(struct wiphy *wiphy, struct net_device *ndev --#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) || defined(BUILD_OPENWRT) - , int link_id - #endif - , u8 key_index -@@ -1885,7 +1885,7 @@ addkey_end: - } - - static int cfg80211_rtw_get_key(struct wiphy *wiphy, struct net_device *ndev --#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) || defined(BUILD_OPENWRT) - , int link_id - #endif - , u8 keyid -@@ -2053,7 +2053,7 @@ exit: - } - - static int cfg80211_rtw_del_key(struct wiphy *wiphy, struct net_device *ndev, --#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) || defined(BUILD_OPENWRT) - int link_id, - #endif - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE) -@@ -2077,7 +2077,7 @@ static int cfg80211_rtw_del_key(struct w - - static int cfg80211_rtw_set_default_key(struct wiphy *wiphy, - struct net_device *ndev, --#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) || defined(BUILD_OPENWRT) - int link_id, - #endif - u8 key_index -@@ -2129,7 +2129,7 @@ static int cfg80211_rtw_set_default_key( - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30)) - int cfg80211_rtw_set_default_mgmt_key(struct wiphy *wiphy, - struct net_device *ndev, --#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) || defined(BUILD_OPENWRT) - int link_id, - #endif - u8 key_index) -@@ -5283,7 +5283,7 @@ exit: - return ret; - } - --#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 7, 0)) -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 7, 0)) || defined(BUILD_OPENWRT) - static int cfg80211_rtw_change_beacon(struct wiphy *wiphy, struct net_device *ndev, - struct cfg80211_ap_update *params) - { -@@ -5315,7 +5315,7 @@ static int cfg80211_rtw_change_beacon(st - return ret; - } - --#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 19, 2)) -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 19, 2)) && !defined(BUILD_OPENWRT) - static int cfg80211_rtw_stop_ap(struct wiphy *wiphy, struct net_device *ndev) - #else - static int cfg80211_rtw_stop_ap(struct wiphy *wiphy, struct net_device *ndev, unsigned int link_id) -@@ -6191,7 +6191,7 @@ static int cfg80211_rtw_set_channel(stru - return 0; - } - --#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 2)) -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 2)) || defined(BUILD_OPENWRT) - static int cfg80211_rtw_get_channel(struct wiphy *wiphy, struct wireless_dev *wdev, unsigned int link_id, struct cfg80211_chan_def *chandef){ - #else - static int cfg80211_rtw_get_channel(struct wiphy *wiphy, struct wireless_dev *wdev, struct cfg80211_chan_def *chandef){ -@@ -7862,7 +7862,7 @@ static int cfg80211_rtw_tdls_mgmt(struct - #else - u8 *peer, - #endif --#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 5, 0)) -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 5, 0)) || defined(BUILD_OPENWRT) - int link_id, - #endif - u8 action_code, -@@ -10484,7 +10484,7 @@ void rtw_wdev_unregister(struct wireless - rtw_cfg80211_indicate_scan_done(adapter, _TRUE); - - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)) || defined(COMPAT_KERNEL_RELEASE) -- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 2)) -+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 2)) || defined(BUILD_OPENWRT) - if (wdev->links[0].client.current_bss) { - #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 2)) - if (wdev->connected) { ---- a/os_dep/linux/os_intfs.c -+++ b/os_dep/linux/os_intfs.c -@@ -2798,7 +2798,13 @@ static int netdev_vir_if_close(struct ne - - #ifdef CONFIG_IOCTL_CFG80211 - wdev->iftype = NL80211_IFTYPE_MONITOR; -- wdev->current_bss = NULL; -+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 0, 0) || defined(BUILD_OPENWRT)) -+ wdev->links[0].client.current_bss = NULL; -+ #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(5,19, 2)) -+ wdev->connected = NULL; -+ #else -+ wdev->current_bss = NULL; -+ #endif - rtw_scan_abort(padapter); - rtw_cfg80211_wait_scan_req_empty(padapter, 200); - adapter_wdev_data(padapter)->bandroid_scan = _FALSE; diff --git a/package/kernel/rtl8812au-ct/Makefile b/package/kernel/rtl8812au-ct/Makefile deleted file mode 100644 index ceb1d06f1..000000000 --- a/package/kernel/rtl8812au-ct/Makefile +++ /dev/null @@ -1,55 +0,0 @@ -include $(TOPDIR)/rules.mk - -PKG_NAME:=rtl8812au-ct -PKG_RELEASE=1 - -PKG_LICENSE:=GPLv2 -PKG_LICENSE_FILES:= - -PKG_SOURCE_URL:=https://github.com/greearb/rtl8812AU_8821AU_linux.git -PKG_MIRROR_HASH:=31e658df3e4d4c18c396259c2e0bef2bfc44a4aa870931f031a31e948be98af4 -PKG_SOURCE_PROTO:=git -PKG_SOURCE_DATE:=2021-11-07 -PKG_SOURCE_VERSION:=39df55967b7de9f6c9600017b724303f95a8b9e2 - -PKG_MAINTAINER:=Ben Greear -PKG_BUILD_PARALLEL:=1 -#PKG_EXTMOD_SUBDIRS:=rtl8812au-ct - -STAMP_CONFIGURED_DEPENDS := $(STAGING_DIR)/usr/include/mac80211-backport/backport/autoconf.h - -include $(INCLUDE_DIR)/kernel.mk -include $(INCLUDE_DIR)/package.mk - -define KernelPackage/rtl8812au-ct - SUBMENU:=Wireless Drivers - TITLE:=Driver for Realtek 8812 AU devices comfast 912-ac, etc - DEPENDS:=@!(LINUX_6_6) +kmod-cfg80211 +kmod-usb-core +@DRIVER_11AC_SUPPORT - FILES:=\ - $(PKG_BUILD_DIR)/rtl8812au.ko - AUTOLOAD:=$(call AutoProbe,rtl8812au) - PROVIDES:=kmod-rtl8812au -endef - -NOSTDINC_FLAGS := \ - $(KERNEL_NOSTDINC_FLAGS) \ - -I$(PKG_BUILD_DIR) \ - -I$(PKG_BUILD_DIR)/include \ - -I$(STAGING_DIR)/usr/include/mac80211-backport \ - -I$(STAGING_DIR)/usr/include/mac80211-backport/uapi \ - -I$(STAGING_DIR)/usr/include/mac80211 \ - -I$(STAGING_DIR)/usr/include/mac80211/uapi \ - -include backport/backport.h \ - -Wno-error=address \ - -Wno-error=stringop-overread - -NOSTDINC_FLAGS+=-DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT -DBUILD_OPENWRT - -define Build/Compile - +$(KERNEL_MAKE) $(PKG_JOBS) \ - M="$(PKG_BUILD_DIR)" \ - NOSTDINC_FLAGS="$(NOSTDINC_FLAGS)" \ - modules -endef - -$(eval $(call KernelPackage,rtl8812au-ct)) diff --git a/package/kernel/rtl8812au-ct/patches/001-use-kernel-byteorder.patch b/package/kernel/rtl8812au-ct/patches/001-use-kernel-byteorder.patch deleted file mode 100644 index dd42b1243..000000000 --- a/package/kernel/rtl8812au-ct/patches/001-use-kernel-byteorder.patch +++ /dev/null @@ -1,15 +0,0 @@ -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 -@@ -30,7 +30,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include diff --git a/package/kernel/rtl8812au-ct/patches/002-vendor_command_policy.patch b/package/kernel/rtl8812au-ct/patches/002-vendor_command_policy.patch deleted file mode 100644 index 0b56ed6e5..000000000 --- a/package/kernel/rtl8812au-ct/patches/002-vendor_command_policy.patch +++ /dev/null @@ -1,156 +0,0 @@ -mac80211 from kernel 5.3 and later checks the new policy attribute. -As this driver does not define any policies and does strange things, -just tell mac80211 to ignore the policies. - ---- a/os_dep/linux/rtw_cfgvendor.c -+++ b/os_dep/linux/rtw_cfgvendor.c -@@ -1173,7 +1173,8 @@ static const struct wiphy_vendor_command - .subcmd = BRCM_VENDOR_SCMD_PRIV_STR - }, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, -- .doit = wl_cfgvendor_priv_string_handler -+ .doit = wl_cfgvendor_priv_string_handler, -+ .policy = VENDOR_CMD_RAW_DATA, - }, - #if defined(GSCAN_SUPPORT) && 0 - { -@@ -1182,7 +1183,8 @@ static const struct wiphy_vendor_command - .subcmd = GSCAN_SUBCMD_GET_CAPABILITIES - }, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, -- .doit = wl_cfgvendor_gscan_get_capabilities -+ .doit = wl_cfgvendor_gscan_get_capabilities, -+ .policy = VENDOR_CMD_RAW_DATA, - }, - { - { -@@ -1190,7 +1192,8 @@ static const struct wiphy_vendor_command - .subcmd = GSCAN_SUBCMD_SET_CONFIG - }, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, -- .doit = wl_cfgvendor_set_scan_cfg -+ .doit = wl_cfgvendor_set_scan_cfg, -+ .policy = VENDOR_CMD_RAW_DATA, - }, - { - { -@@ -1198,7 +1201,8 @@ static const struct wiphy_vendor_command - .subcmd = GSCAN_SUBCMD_SET_SCAN_CONFIG - }, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, -- .doit = wl_cfgvendor_set_batch_scan_cfg -+ .doit = wl_cfgvendor_set_batch_scan_cfg, -+ .policy = VENDOR_CMD_RAW_DATA, - }, - { - { -@@ -1206,7 +1210,8 @@ static const struct wiphy_vendor_command - .subcmd = GSCAN_SUBCMD_ENABLE_GSCAN - }, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, -- .doit = wl_cfgvendor_initiate_gscan -+ .doit = wl_cfgvendor_initiate_gscan, -+ .policy = VENDOR_CMD_RAW_DATA, - }, - { - { -@@ -1214,7 +1219,8 @@ static const struct wiphy_vendor_command - .subcmd = GSCAN_SUBCMD_ENABLE_FULL_SCAN_RESULTS - }, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, -- .doit = wl_cfgvendor_enable_full_scan_result -+ .doit = wl_cfgvendor_enable_full_scan_result, -+ .policy = VENDOR_CMD_RAW_DATA, - }, - { - { -@@ -1222,7 +1228,8 @@ static const struct wiphy_vendor_command - .subcmd = GSCAN_SUBCMD_SET_HOTLIST - }, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, -- .doit = wl_cfgvendor_hotlist_cfg -+ .doit = wl_cfgvendor_hotlist_cfg, -+ .policy = VENDOR_CMD_RAW_DATA, - }, - { - { -@@ -1230,7 +1237,8 @@ static const struct wiphy_vendor_command - .subcmd = GSCAN_SUBCMD_SET_SIGNIFICANT_CHANGE_CONFIG - }, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, -- .doit = wl_cfgvendor_significant_change_cfg -+ .doit = wl_cfgvendor_significant_change_cfg, -+ .policy = VENDOR_CMD_RAW_DATA, - }, - { - { -@@ -1238,7 +1246,8 @@ static const struct wiphy_vendor_command - .subcmd = GSCAN_SUBCMD_GET_SCAN_RESULTS - }, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, -- .doit = wl_cfgvendor_gscan_get_batch_results -+ .doit = wl_cfgvendor_gscan_get_batch_results, -+ .policy = VENDOR_CMD_RAW_DATA, - }, - { - { -@@ -1246,7 +1255,8 @@ static const struct wiphy_vendor_command - .subcmd = GSCAN_SUBCMD_GET_CHANNEL_LIST - }, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, -- .doit = wl_cfgvendor_gscan_get_channel_list -+ .doit = wl_cfgvendor_gscan_get_channel_list, -+ .policy = VENDOR_CMD_RAW_DATA, - }, - #endif /* GSCAN_SUPPORT */ - #if defined(RTT_SUPPORT) && 0 -@@ -1256,7 +1266,8 @@ static const struct wiphy_vendor_command - .subcmd = RTT_SUBCMD_SET_CONFIG - }, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, -- .doit = wl_cfgvendor_rtt_set_config -+ .doit = wl_cfgvendor_rtt_set_config, -+ .policy = VENDOR_CMD_RAW_DATA, - }, - { - { -@@ -1264,7 +1275,8 @@ static const struct wiphy_vendor_command - .subcmd = RTT_SUBCMD_CANCEL_CONFIG - }, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, -- .doit = wl_cfgvendor_rtt_cancel_config -+ .doit = wl_cfgvendor_rtt_cancel_config, -+ .policy = VENDOR_CMD_RAW_DATA, - }, - { - { -@@ -1272,7 +1284,8 @@ static const struct wiphy_vendor_command - .subcmd = RTT_SUBCMD_GETCAPABILITY - }, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, -- .doit = wl_cfgvendor_rtt_get_capability -+ .doit = wl_cfgvendor_rtt_get_capability, -+ .policy = VENDOR_CMD_RAW_DATA, - }, - #endif /* RTT_SUPPORT */ - { -@@ -1281,7 +1294,8 @@ static const struct wiphy_vendor_command - .subcmd = ANDR_WIFI_SUBCMD_GET_FEATURE_SET - }, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, -- .doit = rtw_cfgvendor_get_feature_set -+ .doit = rtw_cfgvendor_get_feature_set, -+ .policy = VENDOR_CMD_RAW_DATA, - }, - { - { -@@ -1289,7 +1303,8 @@ static const struct wiphy_vendor_command - .subcmd = ANDR_WIFI_SUBCMD_GET_FEATURE_SET_MATRIX - }, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, -- .doit = rtw_cfgvendor_get_feature_set_matrix -+ .doit = rtw_cfgvendor_get_feature_set_matrix, -+ .policy = VENDOR_CMD_RAW_DATA, - } - }; - diff --git a/package/kernel/rtl8812au-ct/patches/003-wireless-5.8.patch b/package/kernel/rtl8812au-ct/patches/003-wireless-5.8.patch deleted file mode 100644 index 67ebb82b3..000000000 --- a/package/kernel/rtl8812au-ct/patches/003-wireless-5.8.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/os_dep/linux/ioctl_cfg80211.c -+++ b/os_dep/linux/ioctl_cfg80211.c -@@ -5177,6 +5177,15 @@ 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) -+{ -+ -+} -+#endif -+ - #if defined(CONFIG_TDLS) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0)) - static int cfg80211_rtw_tdls_mgmt(struct wiphy *wiphy, - struct net_device *ndev, -@@ -5990,7 +5999,10 @@ static struct cfg80211_ops rtw_cfg80211_ - .cancel_remain_on_channel = cfg80211_rtw_cancel_remain_on_channel, - #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, - #elif (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,34) && LINUX_VERSION_CODE<=KERNEL_VERSION(2,6,35)) - .action = cfg80211_rtw_mgmt_tx, diff --git a/package/kernel/rtl8812au-ct/patches/004-remove-extern-inline.patch b/package/kernel/rtl8812au-ct/patches/004-remove-extern-inline.patch deleted file mode 100644 index 871fe1063..000000000 --- a/package/kernel/rtl8812au-ct/patches/004-remove-extern-inline.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/include/ieee80211.h -+++ b/include/ieee80211.h -@@ -1313,18 +1313,18 @@ enum ieee80211_state { - (((Addr[2]) & 0xff) == 0xff) && (((Addr[3]) & 0xff) == 0xff) && (((Addr[4]) & 0xff) == 0xff) && \ - (((Addr[5]) & 0xff) == 0xff)) - #else --extern __inline int is_multicast_mac_addr(const u8 *addr) -+__inline static int is_multicast_mac_addr(const u8 *addr) - { - return ((addr[0] != 0xff) && (0x01 & addr[0])); - } - --extern __inline int is_broadcast_mac_addr(const u8 *addr) -+__inline static int is_broadcast_mac_addr(const u8 *addr) - { - return ((addr[0] == 0xff) && (addr[1] == 0xff) && (addr[2] == 0xff) && \ - (addr[3] == 0xff) && (addr[4] == 0xff) && (addr[5] == 0xff)); - } - --extern __inline int is_zero_mac_addr(const u8 *addr) -+__inline static int is_zero_mac_addr(const u8 *addr) - { - return ((addr[0] == 0x00) && (addr[1] == 0x00) && (addr[2] == 0x00) && \ - (addr[3] == 0x00) && (addr[4] == 0x00) && (addr[5] == 0x00)); diff --git a/package/kernel/rtl8812au-ct/patches/100-api_update.patch b/package/kernel/rtl8812au-ct/patches/100-api_update.patch deleted file mode 100644 index 2c081256e..000000000 --- a/package/kernel/rtl8812au-ct/patches/100-api_update.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- a/os_dep/linux/ioctl_cfg80211.c -+++ b/os_dep/linux/ioctl_cfg80211.c -@@ -798,8 +798,8 @@ check_bss: - - DBG_871X(FUNC_ADPT_FMT" call cfg80211_roamed\n", FUNC_ADPT_ARG(padapter)); - #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) -- roam_info.channel = notify_channel; -- roam_info.bssid = cur_network->network.MacAddress; -+ roam_info.links[0].channel = notify_channel; -+ roam_info.links[0].bssid = cur_network->network.MacAddress; - roam_info.req_ie = pmlmepriv->assoc_req + sizeof(struct rtw_ieee80211_hdr_3addr) + 2; - roam_info.req_ie_len = pmlmepriv->assoc_req_len - sizeof(struct rtw_ieee80211_hdr_3addr) - 2; - roam_info.resp_ie = pmlmepriv->assoc_rsp + sizeof(struct rtw_ieee80211_hdr_3addr) + 6; -@@ -1389,6 +1389,7 @@ exit: - - static int cfg80211_rtw_add_key(struct wiphy *wiphy, struct net_device *ndev, - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE) -+ int link_id, - u8 key_index, bool pairwise, const u8 *mac_addr, - #else // (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) - u8 key_index, const u8 *mac_addr, -@@ -1529,6 +1530,7 @@ addkey_end: - - static int cfg80211_rtw_get_key(struct wiphy *wiphy, struct net_device *ndev, - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE) -+ int link_id, - u8 key_index, bool pairwise, const u8 *mac_addr, - #else // (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) - u8 key_index, const u8 *mac_addr, -@@ -1562,6 +1564,7 @@ static int cfg80211_rtw_get_key(struct w - - static int cfg80211_rtw_del_key(struct wiphy *wiphy, struct net_device *ndev, - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE) -+ int link_id, - u8 key_index, bool pairwise, const u8 *mac_addr) - #else // (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) - u8 key_index, const u8 *mac_addr) -@@ -1581,7 +1584,7 @@ static int cfg80211_rtw_del_key(struct w - } - - static int cfg80211_rtw_set_default_key(struct wiphy *wiphy, -- struct net_device *ndev, u8 key_index -+ struct net_device *ndev, int link_id, u8 key_index - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)) || defined(COMPAT_KERNEL_RELEASE) - , bool unicast, bool multicast - #endif -@@ -4019,7 +4022,8 @@ static int cfg80211_rtw_change_beacon(st - return ret; - } - --static int cfg80211_rtw_stop_ap(struct wiphy *wiphy, struct net_device *ndev) -+static int cfg80211_rtw_stop_ap(struct wiphy *wiphy, struct net_device *ndev, -+ unsigned int link_id) - { - DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); - return 0;