- up to 5.6.4.2

diff --git a/kernel-5.1.patch b/kernel-5.1.patch
deleted file mode 100644 (file)
index aa724f0..0000000
--- a/kernel-5.1.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From ac063a4b1a87855e10f6cd1f358aaccbeee9b9c1 Mon Sep 17 00:00:00 2001
-From: gordboy <35108003+gordboy@users.noreply.github.com>
-Date: Mon, 18 Mar 2019 22:04:56 +0000
-Subject: [PATCH] Update to kernel 5.1
-
----
- README.md              | 2 +-
- os_dep/osdep_service.c | 4 ++++
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/README.md b/README.md
-index 74514dc..074018d 100644
---- a/README.md
-+++ b/README.md
-@@ -4,7 +4,7 @@
- 
- Only supports 8812AU chipset.
- 
--Works fine with 5.0-rc2 kernel. Source now builds with no warnings or errors.
-+Works fine with 5.1-rc1 kernel. Source now builds with no warnings or errors.
- 
- Greatly improved stability due to huge rewrite of phydm - "4 second glitch" seems to have been fixed, or at least vastly reduced, in driver version 5.2.20.2.
- 
-diff --git a/os_dep/osdep_service.c b/os_dep/osdep_service.c
-index 5823d59..407fdfc 100644
---- a/os_dep/osdep_service.c
-+++ b/os_dep/osdep_service.c
-@@ -2072,6 +2072,10 @@ static int writeFile(struct file *fp, char *buf, int len)
- 
- }
- 
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0))
-+  #define get_ds() (KERNEL_DS)
-+#endif
-+
- /*
- * Test if the specifi @param path is a file and readable
- * If readable, @param sz is got

diff --git a/kernel-5.2.patch b/kernel-5.2.patch
deleted file mode 100644 (file)
index 99c7191..0000000
--- a/kernel-5.2.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 6faa3eaf8916667cb7f4ab59923b3608e6ab7b18 Mon Sep 17 00:00:00 2001
-From: gordboy <35108003+gordboy@users.noreply.github.com>
-Date: Mon, 20 May 2019 21:29:44 +0100
-Subject: [PATCH] Update README.md for 5.2 kernel fix
-
----
- README.md | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/README.md b/README.md
-index 074018d..98238ab 100644
---- a/README.md
-+++ b/README.md
-@@ -4,7 +4,7 @@
- 
- Only supports 8812AU chipset.
- 
--Works fine with 5.1-rc1 kernel. Source now builds with no warnings or errors.
-+Works fine with 5.2-rc1 kernel. Source now builds with no warnings or errors.
- 
- Greatly improved stability due to huge rewrite of phydm - "4 second glitch" seems to have been fixed, or at least vastly reduced, in driver version 5.2.20.2.
- 
-From b353639a70631dc6c88af3cbea1ff7b28b888630 Mon Sep 17 00:00:00 2001
-From: Hansruedi Patzen <hp@revy.ch>
-Date: Tue, 14 May 2019 15:10:12 +0200
-Subject: [PATCH] linux-5.2: disable fallback from rtw_select_queue
-
-The fallback parameter has been removed in the latest kernel (>= 5.2)
-
-See: https://github.com/torvalds/linux/commit/a350eccee5830d9a1f29e393a88dc05a15326d44
----
- os_dep/linux/os_intfs.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/os_dep/linux/os_intfs.c b/os_dep/linux/os_intfs.c
-index 5da6a49..49ce4d8 100644
---- a/os_dep/linux/os_intfs.c
-+++ b/os_dep/linux/os_intfs.c
-@@ -1286,7 +1286,7 @@ static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb
-   #else
-     , struct net_device *sb_dev
-   #endif
--  #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0)
-+  #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) && LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0))
-         , select_queue_fallback_t fallback
-   #endif
- #endif

diff --git a/rtl8812au.spec b/rtl8812au.spec
index 6168fa80f9a7df82a0c356f600481c41033ad35f..0674ac6b5c36f3425eb8f8cd881c32c0759cdac1 100644 (file)
--- a/rtl8812au.spec
+++ b/rtl8812au.spec
@@ -5,23 +5,21 @@
 # nothing to be placed to debuginfo package
 %define                _enable_debug_packages  0
 
 # nothing to be placed to debuginfo package
 %define                _enable_debug_packages  0
 

-%define                rel     3
-%define                snap    20190309
+%define                rel     1
+%define                snap    20200404

 %define                pname   rtl8812au
 Summary:       Driver for AC1200 (802.11ac) Wireless Dual-Band USB Adapter
 Name:          %{pname}%{_alt_kernel}
 %define                pname   rtl8812au
 Summary:       Driver for AC1200 (802.11ac) Wireless Dual-Band USB Adapter
 Name:          %{pname}%{_alt_kernel}

-Version:       5.2.20.2
+Version:       5.6.4.2

 Epoch:         2
 Release:       0.%{snap}.%{rel}%{?_pld_builder:@%{_kernel_ver_str}}
 License:       GPL
 Group:         Base/Kernel
 Epoch:         2
 Release:       0.%{snap}.%{rel}%{?_pld_builder:@%{_kernel_ver_str}}
 License:       GPL
 Group:         Base/Kernel

-Source0:       https://github.com/gordboy/rtl8812au/archive/master/%{pname}-%{version}-%{snap}.tar.gz
-# Source0-md5: 5b5b12a758b949dd6fd76fe557084462
-Patch0:                kernel-5.1.patch
-Patch1:                kernel-5.2.patch
+Source0:       https://github.com/gordboy/rtl8812au-5.6.4.2/archive/master/%{pname}-%{version}-%{snap}.tar.gz
+# Source0-md5: 17279471a17d6695bd8cd4ddda93b20f

 # good luck finding this chip on Realtek website :/
 #URL:          http://www.realtek.com.tw/
 # good luck finding this chip on Realtek website :/
 #URL:          http://www.realtek.com.tw/

-URL:           https://github.com/gordboy/rtl8812au
+URL:           https://github.com/gordboy/rtl8812au-5.6.4.2

 BuildRequires: rpmbuild(macros) >= 1.701
 %{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}
 BuildRoot:     %{tmpdir}/%{pname}-%{version}-root-%(id -u -n)
 BuildRequires: rpmbuild(macros) >= 1.701
 %{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}
 BuildRoot:     %{tmpdir}/%{pname}-%{version}-root-%(id -u -n)


@@ -62,9 +60,7 @@ Driver for AC1200 (802.11ac) Wireless Dual-Band USB Adapter\
 %{expand:%create_kernel_packages}
 
 %prep
 %{expand:%create_kernel_packages}
 
 %prep

-%setup -q -n %{pname}-master
-%patch0 -p1
-%patch1 -p1
+%setup -q -n %{pname}-%{version}-master

 
 %build
 %{expand:%build_kernel_packages}
 
 %build
 %{expand:%build_kernel_packages}