From b644f496bafb40a3ef04b0c968d64a0e572fde05 Mon Sep 17 00:00:00 2001 From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com> Date: Mon, 30 Nov 2020 11:25:02 +0800 Subject: [PATCH] rtl88x2bu: enable luci control (not tested) --- package/ctcgfw/rtl88x2bu/Makefile | 10 ++--- .../rtl88x2bu/patches/020-remove-iwreq.patch | 33 ---------------- .../patches/020-remove-repeat-flies.patch | 39 +++++++++++++++++++ 3 files changed, 44 insertions(+), 38 deletions(-) delete mode 100644 package/ctcgfw/rtl88x2bu/patches/020-remove-iwreq.patch create mode 100644 package/ctcgfw/rtl88x2bu/patches/020-remove-repeat-flies.patch diff --git a/package/ctcgfw/rtl88x2bu/Makefile b/package/ctcgfw/rtl88x2bu/Makefile index d53833366f..8aa44266c4 100644 --- a/package/ctcgfw/rtl88x2bu/Makefile +++ b/package/ctcgfw/rtl88x2bu/Makefile @@ -1,12 +1,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=rtl88x2bu -PKG_VERSION:=5.6.1 PKG_RELEASE=1 -PKG_LICENSE:=GPLv2 -PKG_LICENSE_FILES:= - PKG_SOURCE_URL:=https://github.com/cilynx/rtl88x2bu.git PKG_SOURCE_PROTO:=git PKG_SOURCE_DATE:=2020-07-21 @@ -16,6 +12,9 @@ PKG_MIRROR_HASH:=ba79fb9a823a38c5acf22999210645ba881da0b5498ee765383dc5eaa8234e6 PKG_MAINTAINER:=[CTCGFW] Project OpenWrt PKG_BUILD_PARALLEL:=1 +PKG_LICENSE:=GPLv2 +PKG_LICENSE_FILES:=LICENSE + STAMP_CONFIGURED_DEPENDS := $(STAGING_DIR)/usr/include/mac80211-backport/backport/autoconf.h include $(INCLUDE_DIR)/kernel.mk @@ -37,9 +36,10 @@ NOSTDINC_FLAGS = \ -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 -EXTRA_CFLAGS=-DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT -DCONFIG_RADIO_WORK -DCONFIG_CONCURRENT_MODE +EXTRA_CFLAGS=-DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT -DRTW_SINGLE_WIPHY -DCONFIG_CONCURRENT_MODE # CONFIG_IOCTL_CFG80211: If kernel version is after 2.6.35, we recommend user to use the new nl80211 API. # RTW_USE_CFG80211_STA_EVENT:It is used for driver to indicate new cfg80211 STA event, diff --git a/package/ctcgfw/rtl88x2bu/patches/020-remove-iwreq.patch b/package/ctcgfw/rtl88x2bu/patches/020-remove-iwreq.patch deleted file mode 100644 index ed184e6faf..0000000000 --- a/package/ctcgfw/rtl88x2bu/patches/020-remove-iwreq.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/include/linux/wireless.h b/include/linux/wireless.h -index c7f4a6c..f7ef486 100644 ---- a/include/linux/wireless.h -+++ b/include/linux/wireless.h -@@ -18,10 +18,11 @@ - - /***************************** INCLUDES *****************************/ - --#if 0 -+#if 1 - #include /* for __u* and __s* typedefs */ - #include /* for "struct sockaddr" et al */ - #include /* for IFNAMSIZ and co... */ -+ #include - #else - #define __user - /* typedef uint16_t __u16; */ -@@ -37,6 +38,8 @@ struct compat_iw_point { - __u16 flags; - }; - #endif -+ -+#if 0 - /* --------------------------- SUBTYPES --------------------------- */ - /* - * For all data larger than 16 octets, we need to use a -@@ -83,5 +86,6 @@ struct iwreq { - /* Data part (defined just above) */ - union iwreq_data u; - }; -+#endif - - #endif /* _LINUX_WIRELESS_H */ diff --git a/package/ctcgfw/rtl88x2bu/patches/020-remove-repeat-flies.patch b/package/ctcgfw/rtl88x2bu/patches/020-remove-repeat-flies.patch new file mode 100644 index 0000000000..51bbd8d3e0 --- /dev/null +++ b/package/ctcgfw/rtl88x2bu/patches/020-remove-repeat-flies.patch @@ -0,0 +1,39 @@ +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