From bc64ca15d4720d34b456c5716dc05f3da7046fde Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 7 Aug 2022 13:24:59 +0200 Subject: [PATCH] kernel: kmod-net-rtl8192su: Remove package The R8712U driver depends on cfg80211. cfg80211 is provided by mac80211 backports, we can not build any in kernel drivers which depend on cfg80211 which is an out of tree module in OpenWrt. The cfg80211 dependency was added with kernel 5.9. We could add rtl8192su to backports and build it from there. Signed-off-by: Hauke Mehrtens (cherry picked from commit 7ebe1dca476ddb2c08f8a1cbbd0522e69c1edc82) --- package/firmware/linux-firmware/realtek.mk | 7 ------- package/kernel/linux/modules/wireless.mk | 18 ------------------ 2 files changed, 25 deletions(-) diff --git a/package/firmware/linux-firmware/realtek.mk b/package/firmware/linux-firmware/realtek.mk index c883e8ba59..e06c3a6369 100644 --- a/package/firmware/linux-firmware/realtek.mk +++ b/package/firmware/linux-firmware/realtek.mk @@ -69,13 +69,6 @@ define Package/rtl8192se-firmware/install endef $(eval $(call BuildPackage,rtl8192se-firmware)) -Package/rtl8192su-firmware = $(call Package/firmware-default,RealTek RTL8192SU firmware) -define Package/rtl8192su-firmware/install - $(INSTALL_DIR) $(1)/lib/firmware/rtlwifi - $(INSTALL_DATA) $(PKG_BUILD_DIR)/rtlwifi/rtl8712u.bin $(1)/lib/firmware/rtlwifi -endef -$(eval $(call BuildPackage,rtl8192su-firmware)) - Package/rtl8723au-firmware = $(call Package/firmware-default,RealTek RTL8723AU firmware) define Package/rtl8723au-firmware/install $(INSTALL_DIR) $(1)/lib/firmware/rtlwifi diff --git a/package/kernel/linux/modules/wireless.mk b/package/kernel/linux/modules/wireless.mk index f7a40ba10a..5737c39ccf 100644 --- a/package/kernel/linux/modules/wireless.mk +++ b/package/kernel/linux/modules/wireless.mk @@ -22,21 +22,3 @@ define KernelPackage/net-prism54/description endef $(eval $(call KernelPackage,net-prism54)) - - -define KernelPackage/net-rtl8192su - SUBMENU:=$(WIRELESS_MENU) - TITLE:=RTL8192SU support (staging) - DEPENDS:=@USB_SUPPORT +@DRIVER_WEXT_SUPPORT +kmod-usb-core +rtl8192su-firmware - KCONFIG:=\ - CONFIG_STAGING=y \ - CONFIG_R8712U - FILES:=$(LINUX_DIR)/drivers/staging/rtl8712/r8712u.ko - AUTOLOAD:=$(call AutoProbe,r8712u) -endef - -define KernelPackage/net-rtl8192su/description - Kernel modules for RealTek RTL8712 and RTL81XXSU fullmac support. -endef - -$(eval $(call KernelPackage,net-rtl8192su)) -- 2.30.2