diff --git a/package/firmware/linux-firmware/realtek.mk b/package/firmware/linux-firmware/realtek.mk
index 1227e5268..5ba679d40 100644
--- a/package/firmware/linux-firmware/realtek.mk
+++ b/package/firmware/linux-firmware/realtek.mk
@@ -20,7 +20,7 @@ define Package/r8169-firmware/install
 endef
 $(eval $(call BuildPackage,r8169-firmware))
 
-Package/rtl8188eu-firmware = $(call Package/firmware-default,RealTek RTL8188EU firmware)
+Package/rtl8188eu-firmware = $(call Package/firmware-default,RealTek RTL8188EU firmware,,LICENCE.rtlwifi_firmware.txt)
 define Package/rtl8188eu-firmware/install
 	$(INSTALL_DIR) $(1)/lib/firmware/rtlwifi
 	$(CP) \
@@ -29,7 +29,16 @@ define Package/rtl8188eu-firmware/install
 endef
 $(eval $(call BuildPackage,rtl8188eu-firmware))
 
-Package/rtl8192ce-firmware = $(call Package/firmware-default,RealTek RTL8192CE firmware)
+Package/rtl8188fu-firmware = $(call Package/firmware-default,RealTek RTL8188FU firmware,,LICENCE.rtlwifi_firmware.txt)
+define Package/rtl8188fu-firmware/install
+	$(INSTALL_DIR) $(1)/lib/firmware/rtlwifi
+	$(CP) \
+		$(PKG_BUILD_DIR)/rtlwifi/rtl8188fufw.bin \
+		$(1)/lib/firmware/rtlwifi
+endef
+$(eval $(call BuildPackage,rtl8188fu-firmware))
+
+Package/rtl8192ce-firmware = $(call Package/firmware-default,RealTek RTL8192CE firmware,,LICENCE.rtlwifi_firmware.txt)
 define Package/rtl8192ce-firmware/install
 	$(INSTALL_DIR) $(1)/lib/firmware/rtlwifi
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/rtlwifi/rtl8192cfw.bin $(1)/lib/firmware/rtlwifi
@@ -38,7 +47,7 @@ define Package/rtl8192ce-firmware/install
 endef
 $(eval $(call BuildPackage,rtl8192ce-firmware))
 
-Package/rtl8192cu-firmware = $(call Package/firmware-default,RealTek RTL8192CU firmware)
+Package/rtl8192cu-firmware = $(call Package/firmware-default,RealTek RTL8192CU firmware,,LICENCE.rtlwifi_firmware.txt)
 define Package/rtl8192cu-firmware/install
 	$(INSTALL_DIR) $(1)/lib/firmware/rtlwifi
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/rtlwifi/rtl8192cufw.bin $(1)/lib/firmware/rtlwifi
@@ -48,28 +57,28 @@ define Package/rtl8192cu-firmware/install
 endef
 $(eval $(call BuildPackage,rtl8192cu-firmware))
 
-Package/rtl8192de-firmware = $(call Package/firmware-default,RealTek RTL8192DE firmware)
+Package/rtl8192de-firmware = $(call Package/firmware-default,RealTek RTL8192DE firmware,,LICENCE.rtlwifi_firmware.txt)
 define Package/rtl8192de-firmware/install
 	$(INSTALL_DIR) $(1)/lib/firmware/rtlwifi
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/rtlwifi/rtl8192defw.bin $(1)/lib/firmware/rtlwifi
 endef
 $(eval $(call BuildPackage,rtl8192de-firmware))
 
-Package/rtl8192eu-firmware = $(call Package/firmware-default,RealTek RTL8192EU firmware)
+Package/rtl8192eu-firmware = $(call Package/firmware-default,RealTek RTL8192EU firmware,,LICENCE.rtlwifi_firmware.txt)
 define Package/rtl8192eu-firmware/install
 	$(INSTALL_DIR) $(1)/lib/firmware/rtlwifi
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/rtlwifi/rtl8192eu_nic.bin $(1)/lib/firmware/rtlwifi
 endef
 $(eval $(call BuildPackage,rtl8192eu-firmware))
 
-Package/rtl8192se-firmware = $(call Package/firmware-default,RealTek RTL8192SE firmware)
+Package/rtl8192se-firmware = $(call Package/firmware-default,RealTek RTL8192SE firmware,,LICENCE.rtlwifi_firmware.txt)
 define Package/rtl8192se-firmware/install
 	$(INSTALL_DIR) $(1)/lib/firmware/rtlwifi
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/rtlwifi/rtl8192sefw.bin $(1)/lib/firmware/rtlwifi
 endef
 $(eval $(call BuildPackage,rtl8192se-firmware))
 
-Package/rtl8723au-firmware = $(call Package/firmware-default,RealTek RTL8723AU firmware)
+Package/rtl8723au-firmware = $(call Package/firmware-default,RealTek RTL8723AU firmware,,LICENCE.rtlwifi_firmware.txt)
 define Package/rtl8723au-firmware/install
 	$(INSTALL_DIR) $(1)/lib/firmware/rtlwifi
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/rtlwifi/rtl8723aufw_A.bin $(1)/lib/firmware/rtlwifi
@@ -78,7 +87,15 @@ define Package/rtl8723au-firmware/install
 endef
 $(eval $(call BuildPackage,rtl8723au-firmware))
 
-Package/rtl8723bu-firmware = $(call Package/firmware-default,RealTek RTL8723BU firmware)
+Package/rtl8723be-firmware = $(call Package/firmware-default,RealTek RTL8723BE firmware,,LICENCE.rtlwifi_firmware.txt)
+define Package/rtl8723be-firmware/install
+	$(INSTALL_DIR) $(1)/lib/firmware/rtlwifi
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/rtlwifi/rtl8723befw_36.bin $(1)/lib/firmware/rtlwifi
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/rtlwifi/rtl8723befw.bin $(1)/lib/firmware/rtlwifi
+endef
+$(eval $(call BuildPackage,rtl8723be-firmware))
+
+Package/rtl8723bu-firmware = $(call Package/firmware-default,RealTek RTL8723BU firmware,,LICENCE.rtlwifi_firmware.txt)
 define Package/rtl8723bu-firmware/install
 	$(INSTALL_DIR) $(1)/lib/firmware/rtlwifi
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/rtlwifi/rtl8723bu_nic.bin $(1)/lib/firmware/rtlwifi
@@ -86,12 +103,12 @@ define Package/rtl8723bu-firmware/install
 endef
 $(eval $(call BuildPackage,rtl8723bu-firmware))
 
-Package/rtl8723du-firmware = $(call Package/firmware-default,RealTek RTL8723DU firmware)
-define Package/rtl8723du-firmware/install
+Package/rtl8723de-firmware = $(call Package/firmware-default,RealTek RTL8723DE firmware)
+define Package/rtl8723de-firmware/install
 	$(INSTALL_DIR) $(1)/lib/firmware/rtw88
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/rtw88/rtw8723d_fw.bin $(1)/lib/firmware/rtw88
 endef
-$(eval $(call BuildPackage,rtl8723du-firmware))
+$(eval $(call BuildPackage,rtl8723de-firmware))
 
 Package/rtl8761a-firmware = $(call Package/firmware-default,RealTek RTL8761A firmware)
 define Package/rtl8761a-firmware/install
@@ -116,7 +133,7 @@ define Package/rtl8761bu-firmware/install
 endef
 $(eval $(call BuildPackage,rtl8761bu-firmware))
 
-Package/rtl8821ae-firmware = $(call Package/firmware-default,RealTek RTL8821AE firmware)
+Package/rtl8821ae-firmware = $(call Package/firmware-default,RealTek RTL8821AE firmware,,LICENCE.rtlwifi_firmware.txt)
 define Package/rtl8821ae-firmware/install
 	$(INSTALL_DIR) $(1)/lib/firmware/rtlwifi
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/rtlwifi/rtl8821aefw_29.bin $(1)/lib/firmware/rtlwifi
diff --git a/package/kernel/mac80211/realtek.mk b/package/kernel/mac80211/realtek.mk
index 2f1fa8376..5aeddb99b 100644
--- a/package/kernel/mac80211/realtek.mk
+++ b/package/kernel/mac80211/realtek.mk
@@ -1,7 +1,10 @@
 PKG_DRIVERS += \
-	rtlwifi rtlwifi-pci rtlwifi-btcoexist rtlwifi-usb rtl8192c-common \
-	rtl8192ce rtl8192se rtl8192de rtl8192cu rtl8723bs rtl8821ae \
-	rtl8xxxu rtw88
+	rtlwifi rtlwifi-pci rtlwifi-btcoexist rtlwifi-usb rtl8192c-common rtl8192d-common \
+	rtl8192ce rtl8192se rtl8192de rtl8192cu rtl8723-common rtl8723be rtl8723bs rtl8821ae \
+	rtl8xxxu rtw88 rtw88-pci rtw88-usb rtw88-sdio rtw88-8821c rtw88-8822b rtw88-8822c \
+	rtw88-8723x rtw88-8723d rtw88-8821ce rtw88-8821cu rtw88-8822be rtw88-8822bu \
+	rtw88-8822ce rtw88-8822cu rtw88-8723de rtw88-8723ds rtw88-8723du \
+	rtw89 rtw89-pci rtw89-8851be rtw89-8852ae rtw89-8852b-common rtw89-8852be rtw89-8852ce
 
 config-$(call config_package,rtlwifi) += RTL_CARDS RTLWIFI
 config-$(call config_package,rtlwifi-pci) += RTLWIFI_PCI
@@ -10,6 +13,7 @@ config-$(call config_package,rtlwifi-usb) += RTLWIFI_USB
 config-$(call config_package,rtl8192c-common) += RTL8192C_COMMON
 config-$(call config_package,rtl8192ce) += RTL8192CE
 config-$(call config_package,rtl8192se) += RTL8192SE
+config-$(call config_package,rtl8192d-common) += RTL8192D_COMMON
 config-$(call config_package,rtl8192de) += RTL8192DE
 config-$(call config_package,rtl8192cu) += RTL8192CU
 config-$(call config_package,rtl8821ae) += RTL8821AE
@@ -18,14 +22,44 @@ config-$(CONFIG_PACKAGE_RTLWIFI_DEBUG) += RTLWIFI_DEBUG
 config-$(call config_package,rtl8xxxu) += RTL8XXXU
 config-y += RTL8XXXU_UNTESTED
 
+config-$(call config_package,rtl8723-common) += RTL8723_COMMON
+config-$(call config_package,rtl8723be) += RTL8723BE
+
 config-$(call config_package,rtl8723bs) += RTL8723BS
 config-y += STAGING
 
-config-$(call config_package,rtw88) += RTW88 RTW88_CORE RTW88_PCI
-config-y += RTW88_8821CE RTW88_8822BE RTW88_8822CE RTW88_8723DE
+config-$(call config_package,rtw88) += RTW88 RTW88_CORE
+config-$(call config_package,rtw88-pci) += RTW88_PCI
+config-$(call config_package,rtw88-usb) += RTW88_USB
+config-$(call config_package,rtw88-sdio) += RTW88_SDIO
+config-$(call config_package,rtw88-8821c) += RTW88_8821C
+config-$(call config_package,rtw88-8821ce) += RTW88_8821CE
+config-$(call config_package,rtw88-8821cu) += RTW88_8821CU
+config-$(call config_package,rtw88-8822b) += RTW88_8822B
+config-$(call config_package,rtw88-8822be) += RTW88_8822BE
+config-$(call config_package,rtw88-8822bu) += RTW88_8822BU
+config-$(call config_package,rtw88-8822c) += RTW88_8822C
+config-$(call config_package,rtw88-8822ce) += RTW88_8822CE
+config-$(call config_package,rtw88-8822cu) += RTW88_8822CU
+config-$(call config_package,rtw88-8723x) += RTW88_8723X
+config-$(call config_package,rtw88-8723d) += RTW88_8723D
+config-$(call config_package,rtw88-8723de) += RTW88_8723DE
+config-$(call config_package,rtw88-8723ds) += RTW88_8723DS
+config-$(call config_package,rtw88-8723du) += RTW88_8723DU
 config-$(CONFIG_PACKAGE_RTW88_DEBUG) += RTW88_DEBUG
 config-$(CONFIG_PACKAGE_RTW88_DEBUGFS) += RTW88_DEBUGFS
 
+config-$(call config_package,rtw89) += RTW89 RTW89_CORE
+config-$(call config_package,rtw89-pci) += RTW89_PCI
+config-$(call config_package,rtw89-8851be) += RTW89_8851B RTW89_8851BE
+config-$(call config_package,rtw89-8852ae) += RTW89_8852A RTW89_8852AE
+config-$(call config_package,rtw89-8852b-common) += RTW89_8852B_COMMON
+config-$(call config_package,rtw89-8852be) += RTW89_8852B RTW89_8852BE
+config-$(call config_package,rtw89-8852ce) += RTW89_8852C RTW89_8852CE
+config-$(CONFIG_PACKAGE_RTW89_DEBUG) += RTW89_DEBUG
+config-$(CONFIG_PACKAGE_RTW89_DEBUGFS) += RTW89_DEBUGFS
+config-$(CONFIG_PACKAGE_RTW89_DEBUGMSG) += RTW89_DEBUGMSG
+
 define KernelPackage/rtlwifi/config
 	config PACKAGE_RTLWIFI_DEBUG
 		bool "Realtek wireless debugging"
@@ -38,7 +72,7 @@ endef
 define KernelPackage/rtlwifi
   $(call KernelPackage/mac80211/Default)
   TITLE:=Realtek common driver part
-  DEPENDS+= @(PCI_SUPPORT||USB_SUPPORT) +kmod-mac80211 +@DRIVER_11N_SUPPORT
+  DEPENDS+= @(PCI_SUPPORT||USB_SUPPORT) +kmod-mac80211
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtlwifi/rtlwifi.ko
   HIDDEN:=1
 endef
@@ -94,10 +128,18 @@ define KernelPackage/rtl8192se
   AUTOLOAD:=$(call AutoProbe,rtl8192se)
 endef
 
+define KernelPackage/rtl8192d-common
+  $(call KernelPackage/mac80211/Default)
+  TITLE:=Realtek RTL8192DE/RTL8192DU common support module
+  DEPENDS+= +kmod-rtlwifi
+  FILES:= $(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtlwifi/rtl8192d/rtl8192d-common.ko
+  HIDDEN:=1
+endef
+
 define KernelPackage/rtl8192de
   $(call KernelPackage/mac80211/Default)
   TITLE:=Realtek RTL8192DE/RTL8188DE support
-  DEPENDS+= +kmod-rtlwifi-pci +rtl8192de-firmware
+  DEPENDS+= +kmod-rtlwifi-pci +kmod-rtl8192d-common +rtl8192de-firmware
   FILES:= $(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtlwifi/rtl8192de/rtl8192de.ko
   AUTOLOAD:=$(call AutoProbe,rtl8192de)
 endef
@@ -168,20 +210,171 @@ endef
 
 define KernelPackage/rtw88
   $(call KernelPackage/mac80211/Default)
-  TITLE:=Realtek RTL8821CE/RTL8822BE/RTL8822CE/RTL8723DE
-  DEPENDS+= @(PCI_SUPPORT) +kmod-mac80211 +@DRIVER_11AC_SUPPORT +@DRIVER_11N_SUPPORT
-  FILES:=\
-	$(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtw88/rtw88_8821ce.ko \
-	$(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtw88/rtw88_8821c.ko \
-	$(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtw88/rtw88_8822be.ko \
-	$(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtw88/rtw88_8822b.ko \
-	$(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtw88/rtw88_8822ce.ko \
-	$(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtw88/rtw88_8822c.ko \
-	$(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtw88/rtw88_8723de.ko \
-	$(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtw88/rtw88_8723d.ko \
-	$(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtw88/rtw88_core.ko \
-	$(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtw88/rtw88_pci.ko
-  AUTOLOAD:=$(call AutoProbe,rtw88_8821ce rtw88_8822be rtw88_8822ce rtw88_8723de)
+  TITLE:=Realtek RTW88 common part
+  DEPENDS+= +kmod-mac80211
+  FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtw88/rtw88_core.ko
+  AUTOLOAD:=$(call AutoProbe,rtw88_core)
+  HIDDEN:=1
+endef
+
+define KernelPackage/rtw88-pci
+  $(call KernelPackage/mac80211/Default)
+  TITLE:=Realtek RTW88 PCI chips support
+  DEPENDS+= @PCI_SUPPORT +kmod-rtw88
+  FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtw88/rtw88_pci.ko
+  AUTOLOAD:=$(call AutoProbe,rtw88_pci)
+  HIDDEN:=1
+endef
+
+define KernelPackage/rtw88-sdio
+  $(call KernelPackage/mac80211/Default)
+  TITLE:=Realtek RTW88 SDIO chips support
+  DEPENDS+= +kmod-mmc +kmod-rtw88
+  FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtw88/rtw88_sdio.ko
+  AUTOLOAD:=$(call AutoProbe,rtw88_sdio)
+  HIDDEN:=1
+endef
+
+define KernelPackage/rtw88-usb
+  $(call KernelPackage/mac80211/Default)
+  TITLE:=Realtek RTW88 USB chips support
+  DEPENDS+= @USB_SUPPORT +kmod-rtw88 +kmod-usb-core
+  FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtw88/rtw88_usb.ko
+  AUTOLOAD:=$(call AutoProbe,rtw88_usb)
+  HIDDEN:=1
+endef
+
+define KernelPackage/rtw88-8821c
+  $(call KernelPackage/mac80211/Default)
+  TITLE:=Realtek RTL8821C family support
+  DEPENDS+= +kmod-rtw88 +rtl8821ce-firmware +@DRIVER_11AC_SUPPORT
+  FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtw88/rtw88_8821c.ko
+  AUTOLOAD:=$(call AutoProbe,rtw88_8821c)
+  HIDDEN:=1
+endef
+
+define KernelPackage/rtw88-8822b
+  $(call KernelPackage/mac80211/Default)
+  TITLE:=Realtek RTL8822B family support
+  DEPENDS+= +kmod-rtw88 +rtl8822be-firmware +@DRIVER_11AC_SUPPORT
+  FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtw88/rtw88_8822b.ko
+  AUTOLOAD:=$(call AutoProbe,rtw88_8822b)
+  HIDDEN:=1
+endef
+
+define KernelPackage/rtw88-8822c
+  $(call KernelPackage/mac80211/Default)
+  TITLE:=Realtek RTL8822C family support
+  DEPENDS+= +kmod-rtw88 +rtl8822ce-firmware +@DRIVER_11AC_SUPPORT
+  FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtw88/rtw88_8822c.ko
+  AUTOLOAD:=$(call AutoProbe,rtw88_8822c)
+  HIDDEN:=1
+endef
+
+define KernelPackage/rtw88-8723x
+  $(call KernelPackage/mac80211/Default)
+  TITLE:=Realtek RTL8723x family support
+  DEPENDS+= +kmod-rtw88
+  FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtw88/rtw88_8723x.ko
+  AUTOLOAD:=$(call AutoProbe,rtw88_8723x)
+  HIDDEN:=1
+endef
+
+define KernelPackage/rtw88-8723d
+  $(call KernelPackage/mac80211/Default)
+  TITLE:=Realtek RTL8723D family support
+  DEPENDS+= +kmod-rtw88-8723x +rtl8723de-firmware
+  FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtw88/rtw88_8723d.ko
+  AUTOLOAD:=$(call AutoProbe,rtw88_8723d)
+  HIDDEN:=1
+endef
+
+define KernelPackage/rtw88-8821ce
+  $(call KernelPackage/mac80211/Default)
+  TITLE:=Realtek RTL8821CE support
+  DEPENDS+= +kmod-rtw88-pci +kmod-rtw88-8821c
+  FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtw88/rtw88_8821ce.ko
+  AUTOLOAD:=$(call AutoProbe,rtw88_8821ce)
+endef
+
+define KernelPackage/rtw88-8821cu
+  $(call KernelPackage/mac80211/Default)
+  TITLE:=Realtek RTL8821CU support
+  DEPENDS+= +kmod-rtw88-usb +kmod-rtw88-8821c
+  FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtw88/rtw88_8821cu.ko
+  AUTOLOAD:=$(call AutoProbe,rtw88_8821cu)
+endef
+
+define KernelPackage/rtw88-8822be
+  $(call KernelPackage/mac80211/Default)
+  TITLE:=Realtek RTL8822BE support
+  DEPENDS+= +kmod-rtw88-pci +kmod-rtw88-8822b
+  FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtw88/rtw88_8822be.ko
+  AUTOLOAD:=$(call AutoProbe,rtw88_8822be)
+endef
+
+define KernelPackage/rtw88-8822bu
+  $(call KernelPackage/mac80211/Default)
+  TITLE:=Realtek RTL8822BU support
+  DEPENDS+= +kmod-rtw88-usb +kmod-rtw88-8822b
+  FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtw88/rtw88_8822bu.ko
+  AUTOLOAD:=$(call AutoProbe,rtw88_8822bu)
+endef
+
+define KernelPackage/rtw88-8822ce
+  $(call KernelPackage/mac80211/Default)
+  TITLE:=Realtek RTL8822CE support
+  DEPENDS+= +kmod-rtw88-pci +kmod-rtw88-8822c
+  FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtw88/rtw88_8822ce.ko
+  AUTOLOAD:=$(call AutoProbe,rtw88_8822ce)
+endef
+
+define KernelPackage/rtw88-8822cu
+  $(call KernelPackage/mac80211/Default)
+  TITLE:=Realtek RTL8822CU support
+  DEPENDS+= +kmod-rtw88-usb +kmod-rtw88-8822c
+  FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtw88/rtw88_8822cu.ko
+  AUTOLOAD:=$(call AutoProbe,rtw88_8822cu)
+endef
+
+define KernelPackage/rtw88-8723de
+  $(call KernelPackage/mac80211/Default)
+  TITLE:=Realtek RTL8723DE support
+  DEPENDS+= +kmod-rtw88-pci +kmod-rtw88-8723d
+  FILES:= $(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtw88/rtw88_8723de.ko
+  AUTOLOAD:=$(call AutoProbe,rtw88_8723de)
+endef
+
+define KernelPackage/rtw88-8723ds
+  $(call KernelPackage/mac80211/Default)
+  TITLE:=Realtek RTL8723DS support
+  DEPENDS+= +kmod-rtw88-sdio +kmod-rtw88-8723d
+  FILES:= $(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtw88/rtw88_8723ds.ko
+  AUTOLOAD:=$(call AutoProbe,rtw88_8723ds)
+endef
+
+define KernelPackage/rtw88-8723du
+  $(call KernelPackage/mac80211/Default)
+  TITLE:=Realtek RTL8723DU support
+  DEPENDS+= +kmod-rtw88-usb +kmod-rtw88-8723d
+  FILES:= $(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtw88/rtw88_8723du.ko
+  AUTOLOAD:=$(call AutoProbe,rtw88_8723du)
+endef
+
+define KernelPackage/rtl8723-common
+  $(call KernelPackage/mac80211/Default)
+  TITLE:=Realtek RTL8723AE/RTL8723BE common support module
+  DEPENDS+= +kmod-rtlwifi
+  FILES:= $(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtlwifi/rtl8723com/rtl8723-common.ko
+  HIDDEN:=1
+endef
+
+define KernelPackage/rtl8723be
+  $(call KernelPackage/mac80211/Default)
+  TITLE:=Realtek RTL8723AE/RTL8723BE support
+  DEPENDS+= +kmod-rtlwifi-btcoexist +kmod-rtlwifi-pci +kmod-rtl8723-common +rtl8723be-firmware
+  FILES:= $(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtlwifi/rtl8723be/rtl8723be.ko
+  AUTOLOAD:=$(call AutoProbe,rtl8723be)
 endef
 
 define KernelPackage/rtl8723bs
@@ -197,3 +390,93 @@ define KernelPackage/rtl8723bs/description
  on the 1st gen Intel Compute Stick, the CHIP and many other Intel Atom and ARM
  based devices.
 endef
+
+define KernelPackage/rtw89/config
+	config PACKAGE_RTW89_DEBUG
+		bool "Realtek wireless debugging (rtw89)"
+		depends on PACKAGE_kmod-rtw89
+		help
+		  Enable debugging output for rtw89 devices.
+
+	config PACKAGE_RTW89_DEBUGFS
+		bool "Enable rtw89 debugfs support"
+		select KERNEL_DEBUG_FS
+		depends on PACKAGE_kmod-rtw89
+		help
+		  Select this to see extensive information about
+		  the internal state of rtw89 in debugfs.
+
+	config PACKAGE_RTW89_DEBUGMSG
+		bool "Realtek rtw89 debug message support"
+		depends on PACKAGE_kmod-rtw89
+		help
+		  Enable debug message support.
+endef
+
+define KernelPackage/rtw89
+  $(call KernelPackage/mac80211/Default)
+  TITLE:=Realtek RTW89 core
+  DEPENDS+= +@DRIVER_11AC_SUPPORT +@DRIVER_11AX_SUPPORT +kmod-mac80211
+  FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtw89/rtw89_core.ko
+  AUTOLOAD:=$(call AutoProbe,rtw89_core)
+  HIDDEN:=1
+endef
+
+define KernelPackage/rtw89-pci
+  $(call KernelPackage/mac80211/Default)
+  TITLE:=Realtek RTW89 PCI chips support
+  DEPENDS+= @PCI_SUPPORT +kmod-rtw89
+  FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtw89/rtw89_pci.ko
+  AUTOLOAD:=$(call AutoProbe,rtw89_pci)
+  HIDDEN:=1
+endef
+
+define KernelPackage/rtw89-8851be
+  $(call KernelPackage/mac80211/Default)
+  TITLE:=Realtek RTL8851BE support
+  DEPENDS+= +kmod-rtw89-pci +rtl8851be-firmware
+  FILES:= \
+	$(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtw89/rtw89_8851b.ko \
+	$(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtw89/rtw89_8851be.ko
+  AUTOLOAD:=$(call AutoProbe,rtw89_8851be)
+endef
+
+define KernelPackage/rtw89-8852ae
+  $(call KernelPackage/mac80211/Default)
+  TITLE:=Realtek RTL8852AE support
+  DEPENDS+= +kmod-rtw89-pci +rtl8852ae-firmware
+  FILES:= \
+	$(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtw89/rtw89_8852a.ko \
+	$(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtw89/rtw89_8852ae.ko
+  AUTOLOAD:=$(call AutoProbe,rtw89_8852ae)
+endef
+
+define KernelPackage/rtw89-8852b-common
+  $(call KernelPackage/mac80211/Default)
+  TITLE:=Realtek RTL8852B family support
+  DEPENDS+= +kmod-rtw89-pci
+  FILES:= \
+	$(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtw89/rtw89_8852b_common.ko
+  AUTOLOAD:=$(call AutoProbe,rtw89_8852b_common)
+  HIDDEN:=1
+endef
+
+define KernelPackage/rtw89-8852be
+  $(call KernelPackage/mac80211/Default)
+  TITLE:=Realtek RTL8852BE support
+  DEPENDS+= +kmod-rtw89-8852b-common +rtl8852be-firmware
+  FILES:= \
+	$(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtw89/rtw89_8852b.ko \
+	$(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtw89/rtw89_8852be.ko
+  AUTOLOAD:=$(call AutoProbe,rtw89_8852be)
+endef
+
+define KernelPackage/rtw89-8852ce
+  $(call KernelPackage/mac80211/Default)
+  TITLE:=Realtek RTL8852CE support
+  DEPENDS+= +kmod-rtw89-pci +rtl8852ce-firmware
+  FILES:= \
+	$(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtw89/rtw89_8852c.ko \
+	$(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtw89/rtw89_8852ce.ko
+  AUTOLOAD:=$(call AutoProbe,rtw89_8852ce)
+endef
diff --git a/package/kernel/rtl8812au-ac/Makefile b/package/kernel/rtl8812au-ac/Makefile
deleted file mode 100644
index 80ec906e5..000000000
--- a/package/kernel/rtl8812au-ac/Makefile
+++ /dev/null
@@ -1,67 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=rtl8812au-ac
-PKG_RELEASE:=2
-
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=
-
-PKG_SOURCE_URL:=https://github.com/aircrack-ng/rtl8812au.git
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_DATE:=2023-01-23
-PKG_SOURCE_VERSION:=e72dacdc4af7cf421484ce9567ef2cc995a16f3a
-PKG_MIRROR_HASH:=4e2168712f62a6d736fbc3422f651c6738a37a40d226617f7d8248ad8abd2433
-
-PKG_LICENSE:=GPL-2.0-only
-PKG_LICENSE_FILES:=LICENSE
-# PKG_MAINTAINER:=
-
-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:=+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 17013bfec..000000000
--- a/package/kernel/rtl8812au-ac/patches/001-use-kernel-byteorder.patch
+++ /dev/null
@@ -1,16 +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 <drv_conf.h>
- #include <basic_types.h>
- #include <osdep_service.h>
--#include <rtw_byteorder.h>
-+#include <asm/byteorder.h>
- #include <wlan_bssdef.h>
- #include <wifi.h>
- #include <ieee80211.h>
- 
\ No newline at end of file
diff --git a/package/kernel/rtl8812au-ac/patches/010-disable-default-build-x86.patch.patch b/package/kernel/rtl8812au-ac/patches/010-disable-default-build-x86.patch.patch
deleted file mode 100644
index 1cfa22bd9..000000000
--- a/package/kernel/rtl8812au-ac/patches/010-disable-default-build-x86.patch.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -98,7 +98,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 aba8ce762..000000000
--- a/package/kernel/rtl8812au-ac/patches/020-change-value-of-vht-enable-and-usb-mode.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- 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 */
---
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 32fe0e064..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
-@@ -2807,6 +2807,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 4b57e0bed..000000000
--- a/package/kernel/rtl8812au-ac/patches/040-wireless-5.8.patch
+++ /dev/null
@@ -1,123 +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, 1, 0))
-+#if (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))
-+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 11, 0) || defined(BUILD_OPENWRT))
- 		cfg80211_ch_switch_started_notify(adapter->pnetdev, &chdef, 0, false);
- #else
- 		cfg80211_ch_switch_started_notify(adapter->pnetdev, &chdef, 0);
-@@ -474,7 +474,7 @@ u8 rtw_cfg80211_ch_switch_notify(_adapte
- 	if (!rtw_cfg80211_allow_ch_switch_notify(adapter))
- 		goto exit;
- 
--#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 2))
-+#if (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);
-@@ -1151,7 +1151,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.links[0].bssid = cur_network->network.MacAddress;
- #else
- 		roam_info.bssid = cur_network->network.MacAddress;
-@@ -1721,7 +1721,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
-@@ -1868,7 +1868,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
-@@ -2036,7 +2036,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)
-@@ -2060,7 +2060,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
-@@ -2112,7 +2112,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)
-@@ -5248,7 +5248,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, unsigned int link_id)
- #else
- static int cfg80211_rtw_stop_ap(struct wiphy *wiphy, struct net_device *ndev)
-@@ -6125,7 +6125,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){
-@@ -10434,9 +10434,9 @@ 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(6, 0, 0))
-+	#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 0, 0) || defined(BUILD_OPENWRT))
- 	if (wdev->links[0].client.current_bss) {
--	#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 2))
-+	#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 2) || defined(BUILD_OPENWRT))
- 	if (wdev->connected) {
- 	#else
- 	if (wdev->current_bss) {
---- a/os_dep/linux/os_intfs.c
-+++ b/os_dep/linux/os_intfs.c
-@@ -2823,7 +2823,13 @@ static int netdev_vir_if_close(struct ne
- 
- #ifdef CONFIG_IOCTL_CFG80211
- 	wdev->iftype = NL80211_IFTYPE_MONITOR;
-+	#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-ac/patches/050-backport-6.1.patch b/package/kernel/rtl8812au-ac/patches/050-backport-6.1.patch
deleted file mode 100644
index 2c6fa17c7..000000000
--- a/package/kernel/rtl8812au-ac/patches/050-backport-6.1.patch
+++ /dev/null
@@ -1,127 +0,0 @@
---- a/os_dep/linux/ioctl_cfg80211.c
-+++ b/os_dep/linux/ioctl_cfg80211.c
-@@ -460,9 +460,7 @@
- 
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0))
- 	if (started) {
--#if (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) || defined(BUILD_OPENWRT))
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 11, 0) || defined(BUILD_OPENWRT))
- 		cfg80211_ch_switch_started_notify(adapter->pnetdev, &chdef, 0, false);
- #else
- 		cfg80211_ch_switch_started_notify(adapter->pnetdev, &chdef, 0);
-@@ -475,7 +473,7 @@
- 		goto exit;
- 
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 2) || defined(BUILD_OPENWRT))
--	cfg80211_ch_switch_notify(adapter->pnetdev, &chdef, 0);
-+	cfg80211_ch_switch_notify(adapter->pnetdev, &chdef);
- #else
- 	cfg80211_ch_switch_notify(adapter->pnetdev, &chdef);
- #endif
-@@ -1152,7 +1150,7 @@
- 
- 		#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 0, 0) || defined(BUILD_OPENWRT))
--		roam_info.links[0].bssid = cur_network->network.MacAddress;
-+		roam_info.bssid = cur_network->network.MacAddress;
- #else
- 		roam_info.bssid = cur_network->network.MacAddress;
- #endif
-@@ -1721,9 +1719,6 @@
- }
- 
- 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
-@@ -1868,9 +1863,6 @@
- }
- 
- 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
-@@ -2036,9 +2028,6 @@
- }
- 
- 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)) */
-@@ -2059,11 +2048,7 @@
- }
- 
- static int cfg80211_rtw_set_default_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
-+	struct net_device *ndev, u8 key_index
- 	#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38)) || defined(COMPAT_KERNEL_RELEASE)
- 	, bool unicast, bool multicast
- 	#endif
-@@ -2111,11 +2096,7 @@
- 
- #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) || defined(BUILD_OPENWRT))
--	int link_id,
--#endif
--	u8 key_index)
-+	struct net_device *ndev, u8 key_index)
- {
- #define SET_DEF_KEY_PARAM_FMT " key_index=%d"
- #define SET_DEF_KEY_PARAM_ARG , key_index
-@@ -5248,11 +5229,7 @@
- 	return ret;
- }
- 
--#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, unsigned int link_id)
--#else
- static int cfg80211_rtw_stop_ap(struct wiphy *wiphy, struct net_device *ndev)
--#endif
- {
- 	_adapter *adapter = (_adapter *)rtw_netdev_priv(ndev);
- 
-@@ -6125,11 +6102,8 @@
- 	return 0;
- }
- 
--#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){
--#endif
- 	_adapter *padapter= wiphy_to_adapter(wiphy);
- 	int channel;
- 	int control_freq;
-@@ -10434,13 +10408,8 @@
- 	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(6, 0, 0) || defined(BUILD_OPENWRT))
--	if (wdev->links[0].client.current_bss) {
--	#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 2) || defined(BUILD_OPENWRT))
--	if (wdev->connected) {
--	#else
-+
- 	if (wdev->current_bss) {
--	#endif
- 		RTW_INFO(FUNC_ADPT_FMT" clear current_bss by cfg80211_disconnected\n", FUNC_ADPT_ARG(adapter));
- 		rtw_cfg80211_indicate_disconnect(adapter, 0, 1);
- 	}
diff --git a/package/kernel/rtl8812au-ct/Makefile b/package/kernel/rtl8812au-ct/Makefile
deleted file mode 100644
index be1acabf2..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 <greearb@candelatech.com>
-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:=+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 <drv_conf.h>
- #include <basic_types.h>
- #include <osdep_service.h>
--#include <rtw_byteorder.h>
-+#include <asm/byteorder.h>
- #include <wlan_bssdef.h>
- #include <wifi.h>
- #include <ieee80211.h>
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;