From a821a4df37169d76637b2f14de25eae75db0b400 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Sat, 6 Jan 2024 11:19:03 +0800 Subject: [PATCH] rtl8821cu: remove package rtw8821cu support has been merged into mac80211, so remove this old crap. Signed-off-by: Tianling Shen --- package/kernel/rtl8821cu/Makefile | 67 ------ .../patches/001-use-kernel-byteorder.patch | 15 -- .../002-use-kernel-wireless-header.patch | 31 --- .../patches/020-remove-repeat-flies.patch | 39 ---- .../030-change-value-of-vht-enable.patch | 11 - .../rtl8821cu/patches/040-wireless-5.8.patch | 54 ----- .../rtl8821cu/patches/050-fix-for-6.1.patch | 208 ------------------ 7 files changed, 425 deletions(-) delete mode 100644 package/kernel/rtl8821cu/Makefile delete mode 100644 package/kernel/rtl8821cu/patches/001-use-kernel-byteorder.patch delete mode 100644 package/kernel/rtl8821cu/patches/002-use-kernel-wireless-header.patch delete mode 100644 package/kernel/rtl8821cu/patches/020-remove-repeat-flies.patch delete mode 100644 package/kernel/rtl8821cu/patches/030-change-value-of-vht-enable.patch delete mode 100644 package/kernel/rtl8821cu/patches/040-wireless-5.8.patch delete mode 100644 package/kernel/rtl8821cu/patches/050-fix-for-6.1.patch diff --git a/package/kernel/rtl8821cu/Makefile b/package/kernel/rtl8821cu/Makefile deleted file mode 100644 index 7931cc07b0..0000000000 --- a/package/kernel/rtl8821cu/Makefile +++ /dev/null @@ -1,67 +0,0 @@ -# SDPX-License-Identifier: GPL-2.0-only -# -# Copyright (C) 2021-2022 ImmortalWrt.org - -include $(TOPDIR)/rules.mk - -PKG_NAME:=rtl8821cu -PKG_RELEASE:=2 - -PKG_SOURCE_URL:=https://github.com/brektrou/rtl8821CU.git -PKG_SOURCE_PROTO:=git -PKG_SOURCE_DATE:=2022-04-09 -PKG_SOURCE_VERSION:=8c2226a74ae718439d56248bd2e44ccf717086d5 -PKG_MIRROR_HASH:=3353a3bc4c73652eceaab95809aab27c3ae8bbf7e915b73488361a061ba91b84 - -PKG_LICENSE:=GPL-2.0-only -PKG_LICENSE_FILES:=LICENSE - -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/rtl8821cu - SUBMENU:=Wireless Drivers - TITLE:=Realtek RTL8811CU/RTL8821CU support - DEPENDS:=+kmod-cfg80211 +kmod-usb-core +@DRIVER_11AC_SUPPORT - FILES:=$(PKG_BUILD_DIR)/rtl8821cu.ko - AUTOLOAD:=$(call AutoProbe,rtl8821cu) - PROVIDES:=kmod-rtl8821cu -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 \ - -DCONFIG_CONCURRENT_MODE \ - -DBUILD_OPENWRT - -ifeq ($(BOARD),x86) - NOSTDINC_FLAGS+= -mhard-float -endif - -define Build/Compile - +$(KERNEL_MAKE) $(PKG_JOBS) \ - M="$(PKG_BUILD_DIR)" \ - NOSTDINC_FLAGS="$(NOSTDINC_FLAGS)" \ - CONFIG_RTL8821CU=m \ - $(if $(CONFIG_aarch64),CONFIG_MP_VHT_HW_TX_MODE=n) \ - USER_MODULE_NAME=rtl8821cu \ - modules -endef - -$(eval $(call KernelPackage,rtl8821cu)) diff --git a/package/kernel/rtl8821cu/patches/001-use-kernel-byteorder.patch b/package/kernel/rtl8821cu/patches/001-use-kernel-byteorder.patch deleted file mode 100644 index e75a278339..0000000000 --- a/package/kernel/rtl8821cu/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 -@@ -25,7 +25,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include diff --git a/package/kernel/rtl8821cu/patches/002-use-kernel-wireless-header.patch b/package/kernel/rtl8821cu/patches/002-use-kernel-wireless-header.patch deleted file mode 100644 index c2c293ac97..0000000000 --- a/package/kernel/rtl8821cu/patches/002-use-kernel-wireless-header.patch +++ /dev/null @@ -1,31 +0,0 @@ -Fix wireless.h to use linux kernel header files -including uapi version of wireless.h - ---- a/include/linux/wireless.h -+++ b/include/linux/wireless.h -@@ -18,16 +18,17 @@ - - /***************************** INCLUDES *****************************/ - --#if 0 -+#if 1 - #include /* for __u* and __s* typedefs */ - #include /* for "struct sockaddr" et al */ - #include /* for IFNAMSIZ and co... */ -+ #include -+ #include - #else - #define __user - /* typedef uint16_t __u16; */ - #include /* for "struct sockaddr" et al */ - #include /* for IFNAMSIZ and co... */ --#endif - - /****************************** TYPES ******************************/ - #ifdef CONFIG_COMPAT -@@ -84,4 +85,5 @@ struct iwreq { - union iwreq_data u; - }; - -+#endif - #endif /* _LINUX_WIRELESS_H */ diff --git a/package/kernel/rtl8821cu/patches/020-remove-repeat-flies.patch b/package/kernel/rtl8821cu/patches/020-remove-repeat-flies.patch deleted file mode 100644 index 76baf2a24a..0000000000 --- a/package/kernel/rtl8821cu/patches/020-remove-repeat-flies.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 9b2b0ec1bc2d31ddf93ed74d63fdfa6044e329a4 Mon Sep 17 00:00:00 2001 -From: Ben Greear -Date: Fri, 9 Nov 2018 16:21:43 -0800 -Subject: [PATCH] Fix build against openwrt backports tree. - -Like breaks builds elsewhere, can fix it up later. - -Signed-off-by: Ben Greear ---- - include/drv_conf.h | 4 +++- - .../{wireless.h => old_unused_rtl_wireless.h} | 0 - include/{autoconf.h => rtl_autoconf.h} | 0 - 3 files changed, 3 insertions(+), 1 deletions(-) - rename include/linux/{wireless.h => old_unused_rtl_wireless.h} (100%) - rename include/{autoconf.h => rtl_autoconf.h} (100%) - -diff --git a/include/drv_conf.h b/include/drv_conf.h -index 0d20a7e..f0a9f88 100644 ---- a/include/drv_conf.h -+++ b/include/drv_conf.h -@@ -14,7 +14,9 @@ - *****************************************************************************/ - #ifndef __DRV_CONF_H__ - #define __DRV_CONF_H__ --#include "autoconf.h" -+ -+#include -+#include "rtl_autoconf.h" - #include "hal_ic_cfg.h" - - #if defined(PLATFORM_LINUX) && defined (PLATFORM_WINDOWS) -diff --git a/include/linux/wireless.h b/include/linux/old_unused_rtl_wireless.h -similarity index 100% -rename from include/linux/wireless.h -rename to include/linux/old_unused_rtl_wireless.h -diff --git a/include/autoconf.h b/include/rtl_autoconf.h -similarity index 100% -rename from include/autoconf.h -rename to include/rtl_autoconf.h diff --git a/package/kernel/rtl8821cu/patches/030-change-value-of-vht-enable.patch b/package/kernel/rtl8821cu/patches/030-change-value-of-vht-enable.patch deleted file mode 100644 index d82aa31bfd..0000000000 --- a/package/kernel/rtl8821cu/patches/030-change-value-of-vht-enable.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/os_dep/linux/os_intfs.c -+++ b/os_dep/linux/os_intfs.c -@@ -238,7 +238,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; diff --git a/package/kernel/rtl8821cu/patches/040-wireless-5.8.patch b/package/kernel/rtl8821cu/patches/040-wireless-5.8.patch deleted file mode 100644 index 273ffc6805..0000000000 --- a/package/kernel/rtl8821cu/patches/040-wireless-5.8.patch +++ /dev/null @@ -1,54 +0,0 @@ ---- a/os_dep/linux/ioctl_cfg80211.c -+++ b/os_dep/linux/ioctl_cfg80211.c -@@ -7149,7 +7149,7 @@ static void cfg80211_rtw_mgmt_frame_regi - #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_regi - /* 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) - 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_ - - #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, ---- a/os_dep/linux/os_intfs.c -+++ b/os_dep/linux/os_intfs.c -@@ -1306,6 +1306,14 @@ unsigned int rtw_classify8021d(struct sk - } - - -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,19,0)) -+static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb -+ , struct net_device *sb_dev -+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(5,2,0)) -+ , select_queue_fallback_t fallback -+ #endif -+) -+#else - static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb - #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0) - , void *accel_priv -@@ -1314,6 +1322,7 @@ static u16 rtw_select_queue(struct net_d - #endif - #endif - ) -+#endif - { - _adapter *padapter = rtw_netdev_priv(dev); - struct mlme_priv *pmlmepriv = &padapter->mlmepriv; diff --git a/package/kernel/rtl8821cu/patches/050-fix-for-6.1.patch b/package/kernel/rtl8821cu/patches/050-fix-for-6.1.patch deleted file mode 100644 index ced6c07bdd..0000000000 --- a/package/kernel/rtl8821cu/patches/050-fix-for-6.1.patch +++ /dev/null @@ -1,208 +0,0 @@ -From ced770c458ec56e00c9a60e487292f9c83bb2bf4 Mon Sep 17 00:00:00 2001 -From: Shiwei Zhang -Date: Fri, 23 Dec 2022 14:27:38 +0800 -Subject: [PATCH 3/3] fix for linux 6.1 - ---- - os_dep/linux/ioctl_cfg80211.c | 14 +++++++------- - os_dep/linux/os_intfs.c | 2 +- - os_dep/osdep_service.c | 18 +++++++++--------- - 3 files changed, 17 insertions(+), 17 deletions(-) - ---- a/include/ieee80211.h -+++ b/include/ieee80211.h -@@ -1529,18 +1529,27 @@ 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) -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 19, 0) && !defined(BUILD_OPENWRT)) -+extern -+#endif -+__inline 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) -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 19, 0) && !defined(BUILD_OPENWRT)) -+extern -+#endif -+__inline 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) -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 19, 0) && !defined(BUILD_OPENWRT)) -+extern -+#endif -+__inline 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)); ---- a/os_dep/linux/ioctl_cfg80211.c -+++ b/os_dep/linux/ioctl_cfg80211.c -@@ -410,14 +410,29 @@ u8 rtw_cfg80211_ch_switch_notify(_adapte - struct wiphy *wiphy = adapter_to_wiphy(adapter); - u8 ret = _SUCCESS; - --#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0)) -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0) || defined(BUILD_OPENWRT)) -+ // 6.3 needs an additional argcument to cfg80211_ch_switch_notify() -+ // https://github.com/torvalds/linux/commit/b345f0637c0042f9e6b78378a32256d90f485774 -+ struct cfg80211_chan_def chdef = {}; -+ -+ ret = rtw_chbw_to_cfg80211_chan_def(wiphy, &chdef, ch, bw, offset, ht); -+ if (ret != _SUCCESS) -+ goto exit; -+ -+ cfg80211_ch_switch_notify(adapter->pnetdev, &chdef, 0, 0); -+ -+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0)) - struct cfg80211_chan_def chdef = {}; - - ret = rtw_chbw_to_cfg80211_chan_def(wiphy, &chdef, ch, bw, offset, ht); - if (ret != _SUCCESS) - goto exit; - -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 0, 0) || defined(BUILD_OPENWRT)) -+ cfg80211_ch_switch_notify(adapter->pnetdev, &chdef, 0); -+#else - cfg80211_ch_switch_notify(adapter->pnetdev, &chdef); -+#endif - - #else - int freq = rtw_ch2freq(ch); -@@ -1085,7 +1100,9 @@ check_bss: - #endif - - #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) -- roam_info.bssid = cur_network->network.MacAddress; -+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 0, 0) || defined(BUILD_OPENWRT)) -+ roam_info.links[0].bssid = cur_network->network.MacAddress; -+ #endif - 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; -@@ -1636,6 +1653,9 @@ exit: - } - - static int cfg80211_rtw_add_key(struct wiphy *wiphy, struct net_device *ndev -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0) || defined(BUILD_OPENWRT)) -+ , int link_id -+#endif - , u8 key_index - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE) - , bool pairwise -@@ -1780,6 +1800,9 @@ addkey_end: - } - - static int cfg80211_rtw_get_key(struct wiphy *wiphy, struct net_device *ndev -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0) || defined(BUILD_OPENWRT)) -+ , int link_id -+#endif - , u8 keyid - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE) - , bool pairwise -@@ -1945,6 +1968,9 @@ exit: - } - - static int cfg80211_rtw_del_key(struct wiphy *wiphy, struct net_device *ndev, -+#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) - u8 key_index, bool pairwise, const u8 *mac_addr) - #else /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) */ -@@ -1965,7 +1991,11 @@ 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 -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0) || defined(BUILD_OPENWRT)) -+ , int link_id -+#endif -+ , u8 key_index - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38)) || defined(COMPAT_KERNEL_RELEASE) - , bool unicast, bool multicast - #endif -@@ -2013,7 +2043,11 @@ 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, u8 key_index) -+ struct net_device *ndev -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0) || defined(BUILD_OPENWRT)) -+ , int link_id -+#endif -+ , u8 key_index) - { - #define SET_DEF_KEY_PARAM_FMT " key_index=%d" - #define SET_DEF_KEY_PARAM_ARG , key_index -@@ -4929,7 +4963,11 @@ 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 -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 0, 0) || defined(BUILD_OPENWRT)) -+ , unsigned int link_id -+#endif -+ ) - { - _adapter *adapter = (_adapter *)rtw_netdev_priv(ndev); - -@@ -9678,12 +9716,12 @@ 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 (wdev->current_bss) { -- RTW_INFO(FUNC_ADPT_FMT" clear current_bss by cfg80211_disconnected\n", FUNC_ADPT_ARG(adapter)); -- rtw_cfg80211_indicate_disconnect(adapter, 0, 1); -- } -- #endif -+ // #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)) || defined(COMPAT_KERNEL_RELEASE) -+ // if (wdev->current_bss) { -+ // RTW_INFO(FUNC_ADPT_FMT" clear current_bss by cfg80211_disconnected\n", FUNC_ADPT_ARG(adapter)); -+ // rtw_cfg80211_indicate_disconnect(adapter, 0, 1); -+ // } -+ // #endif - - if (pwdev_priv->pmon_ndev) { - RTW_INFO("%s, unregister monitor interface\n", __func__); ---- a/os_dep/linux/os_intfs.c -+++ b/os_dep/linux/os_intfs.c -@@ -1652,7 +1652,15 @@ int rtw_os_ndev_register(_adapter *adapt - u8 rtnl_lock_needed = rtw_rtnl_lock_needed(dvobj); - - #ifdef CONFIG_RTW_NAPI -- netif_napi_add(ndev, &adapter->napi, rtw_recv_napi_poll, RTL_NAPI_WEIGHT); -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) -+ netif_napi_add_weight(ndev, &adapter->napi, rtw_recv_napi_poll, RTL_NAPI_WEIGHT); -+#else -+ netif_napi_add(ndev, &adapter->napi, rtw_recv_napi_poll -+#ifndef BUILD_OPENWRT -+ , RTL_NAPI_WEIGHT -+#endif -+ ); -+#endif - #endif /* CONFIG_RTW_NAPI */ - - #if defined(CONFIG_IOCTL_CFG80211) ---- a/os_dep/osdep_service.c -+++ b/os_dep/osdep_service.c -@@ -2614,7 +2614,9 @@ u64 rtw_division64(u64 x, u64 y) - inline u32 rtw_random32(void) - { - #ifdef PLATFORM_LINUX --#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0)) -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) -+ return get_random_u32(); -+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0)) - return prandom_u32(); - #elif (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 18)) - u32 random_int;