From 0b1ae7bfeb5b740174ce2747e26a65f6b2753d95 Mon Sep 17 00:00:00 2001
From: heitbaum <rudi@heitbaum.com>
Date: Sun, 10 Oct 2021 22:09:37 +1100
Subject: [PATCH] RTL8812AU: update to 2021-06-27

---
 packages/linux-drivers/RTL8812AU/package.mk   |  4 +-
 ...Fix-GRO_DROP-deprecation-kernel-5-12.patch | 26 -------
 ...768-don-t-apply-ARM-options-to-ARM64.patch | 68 -------------------
 3 files changed, 2 insertions(+), 96 deletions(-)
 delete mode 100644 packages/linux-drivers/RTL8812AU/patches/Fix-GRO_DROP-deprecation-kernel-5-12.patch
 delete mode 100644 packages/linux-drivers/RTL8812AU/patches/Revert-issue-768-don-t-apply-ARM-options-to-ARM64.patch

diff --git a/packages/linux-drivers/RTL8812AU/package.mk b/packages/linux-drivers/RTL8812AU/package.mk
index 81ae08ddd3..2859c8a4c5 100644
--- a/packages/linux-drivers/RTL8812AU/package.mk
+++ b/packages/linux-drivers/RTL8812AU/package.mk
@@ -3,8 +3,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="RTL8812AU"
-PKG_VERSION="64e7aaa5657ef63ab7ce74ce5554b49a21552e68"
-PKG_SHA256="1b7a79b15348f1a1125a351e5e5ff524456236519e20ee04b59484aefa6afbaa"
+PKG_VERSION="b8167e66b4ac046b3b76c2c40008d84528e91594"
+PKG_SHA256="2c5d8286a00273343fc10d0e16afc52e788ac73b7df57c8159e58a40707f61da"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/aircrack-ng/rtl8812au"
 PKG_URL="https://github.com/aircrack-ng/rtl8812au/archive/${PKG_VERSION}.tar.gz"
diff --git a/packages/linux-drivers/RTL8812AU/patches/Fix-GRO_DROP-deprecation-kernel-5-12.patch b/packages/linux-drivers/RTL8812AU/patches/Fix-GRO_DROP-deprecation-kernel-5-12.patch
deleted file mode 100644
index c544a07ec7..0000000000
--- a/packages/linux-drivers/RTL8812AU/patches/Fix-GRO_DROP-deprecation-kernel-5-12.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From e7e83f2593c9e67e3ee50d032f1ad39fe47ea81d Mon Sep 17 00:00:00 2001
-From: Carlos <CGarces@users.noreply.github.com>
-Date: Sat, 3 Apr 2021 14:38:14 +0000
-Subject: [PATCH] Fix GRO_DROP deprecation kernel 5.12
-
----
- os_dep/linux/recv_linux.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/os_dep/linux/recv_linux.c b/os_dep/linux/recv_linux.c
-index 2f7b3e37..7fecc843 100644
---- a/os_dep/linux/recv_linux.c
-+++ b/os_dep/linux/recv_linux.c
-@@ -355,8 +355,12 @@ static int napi_recv(_adapter *padapter, int budget)
- 
- #ifdef CONFIG_RTW_GRO
- 		if (pregistrypriv->en_gro) {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 12, 0)
- 			if (rtw_napi_gro_receive(&padapter->napi, pskb) != GRO_DROP)
- 				rx_ok = _TRUE;
-+#else
-+			rx_ok = _TRUE;
-+#endif
- 			goto next;
- 		}
- #endif /* CONFIG_RTW_GRO */
diff --git a/packages/linux-drivers/RTL8812AU/patches/Revert-issue-768-don-t-apply-ARM-options-to-ARM64.patch b/packages/linux-drivers/RTL8812AU/patches/Revert-issue-768-don-t-apply-ARM-options-to-ARM64.patch
deleted file mode 100644
index bd3aa2d3c9..0000000000
--- a/packages/linux-drivers/RTL8812AU/patches/Revert-issue-768-don-t-apply-ARM-options-to-ARM64.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From a6daa2907399a2df2c3c1b576fe6256805766c71 Mon Sep 17 00:00:00 2001
-From: Jernej Skrabec <jernej.skrabec@siol.net>
-Date: Tue, 12 Jan 2021 22:16:43 +0100
-Subject: [PATCH] Revert "issue #768: don't apply ARM options to ARM64"
-
-This reverts commit 3325543154cd8900490385eb6326f5e7911c6e7d.
-
-Commit 3325543154cd ("issue #768: don't apply ARM options to ARM64")
-breaks compilation of driver on 32-bit ARM platforms. Issue is that each
-and every 32-bit ARM kernel was always compiled with soft-fp ABI, not
-just that for RPi. Commit author probably thinks on userspace which is
-entirely different thing. Furthermore, same issue is very likely present
-also on 32-bit x86 platforms. There too is soft float flag already part
-of compile flags and can't be overriden with custom ones.
-
-One last thing - these flags are useful only when
-CONFIG_MP_VHT_HW_TX_MODE is set to y. This is probably never used.
----
- Makefile | 26 ++++++++++----------------
- 1 file changed, 10 insertions(+), 16 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 7ba03bb7e9f8..a23673bc3b42 100755
---- a/Makefile
-+++ b/Makefile
-@@ -1118,6 +1118,16 @@ endif
- 
- ifeq ($(CONFIG_MP_VHT_HW_TX_MODE), y)
- EXTRA_CFLAGS += -DCONFIG_MP_VHT_HW_TX_MODE
-+ifeq ($(CONFIG_PLATFORM_I386_PC), y)
-+## For I386 X86 ToolChain use Hardware FLOATING
-+EXTRA_CFLAGS += -mhard-float
-+EXTRA_CFLAGS += -DMARK_KERNEL_PFU
-+else
-+## For ARM ToolChain use Hardware FLOATING
-+# Raspbian kernel is with soft-float.
-+# 'softfp' allows FP instructions, but no FP on function call interfaces
-+EXTRA_CFLAGS += -mfloat-abi=softfp
-+endif
- endif
- 
- ifeq ($(CONFIG_APPEND_VENDOR_IE_ENABLE), y)
-@@ -2124,22 +2134,6 @@ endif
- 
- endif
- 
--ifeq ($(ARCH), i386)
--EXTRA_CFLAGS += -mhard-float
--EXTRA_CFLAGS += -DMARK_KERNEL_PFU
--else ifeq ($(ARCH), x86_64)
--EXTRA_CFLAGS += -mhard-float
--EXTRA_CFLAGS += -DMARK_KERNEL_PFU
--else ifeq ($(ARCH), arm)
--# Raspbian kernel is with soft-float.
--# 'softfp' allows FP instructions, but no FP on function call interfaces
--ifeq ($(CONFIG_PLATFORM_ARM_RPI), y)
--EXTRA_CFLAGS += -mfloat-abi=softfp
--else
--EXTRA_CFLAGS += -mfloat-abi=hard
--endif
--endif
--
- ########### CUSTOMER ################################
- ifeq ($(CONFIG_CUSTOMER_HUAWEI_GENERAL), y)
- CONFIG_CUSTOMER_HUAWEI = y
--- 
-2.30.0
-