From: Jan Rękorajski <baggins@pld-linux.org>
Date: Wed, 31 Jan 2018 07:48:58 +0000 (+0100)
Subject: - updated to 5.2.20_25672.20171213, works with kernel 4.15
X-Git-Tag: auto/th/rtl8812au-5.2.20_25672.20171213-0.20180131.1~1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Frtl8812au.git;a=commitdiff_plain;h=1dfe35b

- updated to 5.2.20_25672.20171213, works with kernel 4.15
- also contains fixes for KRACK
---

diff --git a/kernel-4.15.patch b/kernel-4.15.patch
deleted file mode 100644
index 8ffbe10..0000000
--- a/kernel-4.15.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -ur rtl8812au-5.1.5/include/osdep_service_linux.h rtl8812au-5.1.5-4.15/include/osdep_service_linux.h
---- rtl8812au-5.1.5/include/osdep_service_linux.h	2017-07-30 13:07:06.000000000 +0200
-+++ rtl8812au-5.1.5-4.15/include/osdep_service_linux.h	2018-01-30 09:39:19.303035056 +0100
-@@ -273,9 +273,13 @@
- __inline static void _init_timer(_timer *ptimer, _nic_hdl nic_hdl, void *pfunc, void *cntx)
- {
- 	/* setup_timer(ptimer, pfunc,(u32)cntx);	 */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
-+	timer_setup(ptimer, pfunc, 0);
-+#else
- 	ptimer->function = pfunc;
- 	ptimer->data = (unsigned long)cntx;
- 	init_timer(ptimer);
-+#endif
- }
- 
- __inline static void _set_timer(_timer *ptimer, u32 delay_time)
-diff -ur rtl8812au-5.1.5/os_dep/linux/recv_linux.c rtl8812au-5.1.5-4.15/os_dep/linux/recv_linux.c
---- rtl8812au-5.1.5/os_dep/linux/recv_linux.c	2017-07-30 13:07:06.000000000 +0200
-+++ rtl8812au-5.1.5-4.15/os_dep/linux/recv_linux.c	2018-01-30 10:00:34.479700310 +0100
-@@ -789,10 +789,15 @@
- #endif
- 
- }
--void _rtw_reordering_ctrl_timeout_handler(void *FunctionContext);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0)
-+void _rtw_reordering_ctrl_timeout_handler(struct timer_list *timer)
-+{
-+	struct recv_reorder_ctrl *preorder_ctrl = from_timer(preorder_ctrl, timer, reordering_ctrl_timer);
-+#else
- void _rtw_reordering_ctrl_timeout_handler(void *FunctionContext)
- {
- 	struct recv_reorder_ctrl *preorder_ctrl = (struct recv_reorder_ctrl *)FunctionContext;
-+#endif
- 	rtw_reordering_ctrl_timeout_handler(preorder_ctrl);
- }
- 
diff --git a/rtl8812au.spec b/rtl8812au.spec
index 18349e7..e8ef9dc 100644
--- a/rtl8812au.spec
+++ b/rtl8812au.spec
@@ -5,23 +5,21 @@
 # nothing to be placed to debuginfo package
 %define		_enable_debug_packages	0
 
-%define		rel	1.1
-%define		snap	20171010
+%define		rel	0.1
+%define		snap	20180131
 %define		pname	rtl8812au
 Summary:	Driver for AC1200 (802.11ac) Wireless Dual-Band USB Adapter
 Name:		%{pname}%{_alt_kernel}
-Version:	5.1.5_19247.20160830
+Version:	5.2.20_25672.20171213
 Release:	0.%{snap}.%{rel}%{?_pld_builder:@%{_kernel_ver_str}}
 License:	GPL
 Group:		Base/Kernel
-Source0:	https://github.com/zebulon2/rtl8812au/archive/v5.1.5/%{pname}-%{version}-%{snap}.tar.gz
-# Source0-md5:	41bc57b642e5eda5a449b3b80f0e90fe
+Source0:	https://github.com/gordboy/rtl8812au/archive/master/%{pname}-%{version}-%{snap}.tar.gz
+# Source0-md5:	5fc6e00f86ce93feabf3fd3655207e12
 # good luck finding this chip on Realtek website :/
 #URL:		http://www.realtek.com.tw/
-#URL:		http://www.tenda.com.cn/product/download/U12.html
-URL:		https://github.com/zebulon2/rtl8812au
+URL:		https://github.com/gordboy/rtl8812au
 Patch0:		gcc-4.9.patch
-Patch1:		kernel-4.15.patch
 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)
@@ -43,6 +41,7 @@ Driver for AC1200 (802.11ac) Wireless Dual-Band USB Adapter\
 \
 %files -n kernel%{_alt_kernel}-net-rtl8812au\
 %defattr(644,root,root,755)\
+%doc Realtek_Changelog.txt README.md\
 /lib/modules/%{_kernel_ver}/kernel/drivers/net/wireless/*.ko*\
 \
 %post	-n kernel%{_alt_kernel}-net-rtl8812au\
@@ -61,9 +60,8 @@ Driver for AC1200 (802.11ac) Wireless Dual-Band USB Adapter\
 %{expand:%create_kernel_packages}
 
 %prep
-%setup -q -n %{pname}-5.1.5
+%setup -q -n %{pname}-master
 %patch0 -p1
-%patch1 -p1
 
 %build
 %{expand:%build_kernel_packages}