- fix building with linux 3.18

- rel 5

diff --git a/linux-3.18.patch b/linux-3.18.patch
new file mode 100644 (file)
index 0000000..8ee9323
--- /dev/null
+++ b/linux-3.18.patch
@@ -0,0 +1,15 @@
+--- rtl8812au_linux-master/include/ioctl_cfg80211.h~   2015-01-25 14:44:27.000000000 +0100
++++ rtl8812au_linux-master/include/ioctl_cfg80211.h    2015-01-25 14:50:42.520814117 +0100
+@@ -145,9 +145,11 @@
+ #define rtw_cfg80211_rx_mgmt(adapter, freq, sig_dbm, buf, len, gfp) cfg80211_rx_mgmt((adapter)->pnetdev, freq, sig_dbm, buf, len, gfp)
+ #elif (LINUX_VERSION_CODE < KERNEL_VERSION(3,12,0))
+ #define rtw_cfg80211_rx_mgmt(adapter, freq, sig_dbm, buf, len, gfp) cfg80211_rx_mgmt((adapter)->rtw_wdev, freq, sig_dbm, buf, len, gfp)
+-#else
++#elif (LINUX_VERSION_CODE < KERNEL_VERSION(3,18,0))
+ // 3.12 added a flags argument which is just set to zero
+ #define rtw_cfg80211_rx_mgmt(adapter, freq, sig_dbm, buf, len, gfp) cfg80211_rx_mgmt((adapter)->rtw_wdev, freq, sig_dbm, buf, len, 0, gfp)
++#else
++#define rtw_cfg80211_rx_mgmt(adapter, freq, sig_dbm, buf, len, gfp) cfg80211_rx_mgmt((adapter)->rtw_wdev, freq, sig_dbm, buf, len, 0)
+ #endif
+ 
+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0))  && !defined(COMPAT_KERNEL_RELEASE)

diff --git a/rtl8812au.spec b/rtl8812au.spec
index 4dc3ae796cb6205073a15a15655ddad1bceafeb0..6594ccb32cdd7620854b4bf4b0296aa41d6e1b72 100644 (file)
--- a/rtl8812au.spec
+++ b/rtl8812au.spec
@@ -19,7 +19,7 @@ exit 1
 %define                kpkg    %(echo %{_build_kernels} | tr , '\\n' | while read n ; do echo %%undefine alt_kernel ; [ -z "$n" ] || echo %%define alt_kernel $n ; echo %%kernel_pkg ; done)
 %define                bkpkg   %(echo %{_build_kernels} | tr , '\\n' | while read n ; do echo %%undefine alt_kernel ; [ -z "$n" ] || echo %%define alt_kernel $n ; echo %%build_kernel_pkg ; done)
 
-%define                rel     4
+%define                rel     5
 %define                snap    20140901
 %define                pname   rtl8812au
 Summary:       Driver for AC1200 (802.11ac) Wireless Dual-Band USB Adapter
@@ -40,6 +40,7 @@ Patch2:               enable-cfg80211-support.patch
 Patch3:                update-cfg80211-support.patch
 Patch4:                warnings.patch
 Patch5:                gcc-4.9.patch
+Patch6:                linux-3.18.patch
 BuildRequires: rpmbuild(macros) >= 1.678
 %{?with_dist_kernel:%{expand:%kbrs}}
 BuildRoot:     %{tmpdir}/%{pname}-%{version}-root-%(id -u -n)
@@ -89,6 +90,7 @@ Driver for AC1200 (802.11ac) Wireless Dual-Band USB Adapter\
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 %{expand:%bkpkg}