From d7226b8757b54ded89e1440f4d96224ddf6c47ae Mon Sep 17 00:00:00 2001 From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com> Date: Mon, 10 Aug 2020 19:32:16 +0800 Subject: [PATCH] Revert "rtl8192du: fix build with mac80211-5.8" This branch isn't needed this, and it will broken the compilation. --- package/ntlf9t/rtl8192du/Makefile | 8 ++--- .../patches/010-missing-header-in-ipv6.patch | 14 +++++++++ .../rtl8192du/patches/010-wireless-5.8.patch | 29 ------------------- 3 files changed, 18 insertions(+), 33 deletions(-) create mode 100644 package/ntlf9t/rtl8192du/patches/010-missing-header-in-ipv6.patch delete mode 100644 package/ntlf9t/rtl8192du/patches/010-wireless-5.8.patch diff --git a/package/ntlf9t/rtl8192du/Makefile b/package/ntlf9t/rtl8192du/Makefile index c60a6e5b39..9ba58b3979 100644 --- a/package/ntlf9t/rtl8192du/Makefile +++ b/package/ntlf9t/rtl8192du/Makefile @@ -7,13 +7,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=rtl8192du -PKG_VERSION:=2020-06-11 +PKG_VERSION:=2019-06-01 PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/lwfinger/rtl8192du -PKG_SOURCE_VERSION:=d6185ff4a242ebf553e9e9980da21591660e8f8c -PKG_MIRROR_HASH:=8d7ca5ea8a6daa07ff9dbd8669337ee8b999fdbfb2a8d7216a2eb4d5601537fd +PKG_SOURCE_VERSION:=54c95aaa23fe332afaa1ed4aacbb0db43aa3c7dd +PKG_MIRROR_HASH:=9c21ca7b9115de8e711b38c3005fb22af5a9f392f801ac1f2383d82df789e81a PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz @@ -33,7 +33,7 @@ NOSTDINC_FLAGS = \ -include backport/autoconf.h \ -include backport/backport.h -NOSTDINC_FLAGS+=-DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT -DCONFIG_CONCURRENT_MODE -DBUILD_OPENWRT +NOSTDINC_FLAGS+=-DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT -DCONFIG_CONCURRENT_MODE define KernelPackage/rtl8192du SUBMENU:=Wireless Drivers diff --git a/package/ntlf9t/rtl8192du/patches/010-missing-header-in-ipv6.patch b/package/ntlf9t/rtl8192du/patches/010-missing-header-in-ipv6.patch new file mode 100644 index 0000000000..57938b2df2 --- /dev/null +++ b/package/ntlf9t/rtl8192du/patches/010-missing-header-in-ipv6.patch @@ -0,0 +1,14 @@ +diff --git a/core/rtw_br_ext.c b/core/rtw_br_ext.c +index 964b366..ec1c620 100644 +--- a/core/rtw_br_ext.c ++++ b/core/rtw_br_ext.c +@@ -51,6 +51,9 @@ + #include + #include + #include ++#ifndef _HAVE_ARCH_IPV6_CSUM ++#include ++#endif + #endif + #endif + diff --git a/package/ntlf9t/rtl8192du/patches/010-wireless-5.8.patch b/package/ntlf9t/rtl8192du/patches/010-wireless-5.8.patch deleted file mode 100644 index 07f94bec49..0000000000 --- a/package/ntlf9t/rtl8192du/patches/010-wireless-5.8.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/os_dep/ioctl_cfg80211.c -+++ b/os_dep/ioctl_cfg80211.c -@@ -4941,7 +4941,14 @@ exit: - return ret; - } - --#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0) -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)) || defined(BUILD_OPENWRT) -+static void cfg80211_rtw_update_mgmt_frame_register(struct wiphy *wiphy, -+ struct wireless_dev *wdev, -+ struct mgmt_frame_regs *upd) -+{ -+ -+} -+#else - static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy, - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)) - struct wireless_dev *wdev, -@@ -5355,7 +5362,9 @@ static struct cfg80211_ops rtw_cfg80211_ops = { - - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE) - .mgmt_tx = cfg80211_rtw_mgmt_tx, --#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0) -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)) || defined(BUILD_OPENWRT) -+ .update_mgmt_frame_registrations = cfg80211_rtw_update_mgmt_frame_register, -+#else - .mgmt_frame_register = cfg80211_rtw_mgmt_frame_register, - #endif - #elif (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,34) && LINUX_VERSION_CODE<=KERNEL_VERSION(2,6,35))