From 58132eead4e34a9f29e7bbe73b912eca844ba0ec Mon Sep 17 00:00:00 2001
From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com>
Date: Wed, 12 Aug 2020 21:05:45 +0800
Subject: [PATCH] rtl8821cu: fix build on arm64

---
 .../rtl8821cu/patches/020-remove-iwreq.patch  | 33 ----------------
 .../patches/020-remove-repeat-flies.patch     | 39 +++++++++++++++++++
 2 files changed, 39 insertions(+), 33 deletions(-)
 delete mode 100644 package/ctcgfw/rtl8821cu/patches/020-remove-iwreq.patch
 create mode 100644 package/ctcgfw/rtl8821cu/patches/020-remove-repeat-flies.patch

diff --git a/package/ctcgfw/rtl8821cu/patches/020-remove-iwreq.patch b/package/ctcgfw/rtl8821cu/patches/020-remove-iwreq.patch
deleted file mode 100644
index ed184e6faf..0000000000
--- a/package/ctcgfw/rtl8821cu/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 <linux/types.h>		/* for __u* and __s* typedefs */
- 	#include <linux/socket.h>		/* for "struct sockaddr" et al	*/
- 	#include <linux/if.h>			/* for IFNAMSIZ and co... */
-+	#include <uapi/linux/wireless.h>
- #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/rtl8821cu/patches/020-remove-repeat-flies.patch b/package/ctcgfw/rtl8821cu/patches/020-remove-repeat-flies.patch
new file mode 100644
index 0000000000..76baf2a24a
--- /dev/null
+++ b/package/ctcgfw/rtl8821cu/patches/020-remove-repeat-flies.patch
@@ -0,0 +1,39 @@
+From 9b2b0ec1bc2d31ddf93ed74d63fdfa6044e329a4 Mon Sep 17 00:00:00 2001
+From: Ben Greear <greearb@candelatech.com>
+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 <greearb@candelatech.com>
+---
+ 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 <generated/autoconf.h>
++#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