added patch to compile against linux 5.11

3 files changed, 43 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 69f59e38ff94..c664265c5ce6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = rtl8814au-aircrack-dkms-git
 	pkgdesc = Aircrack-ng kernel module for Realtek (USB adapters only) network cards with 8814au chipset
-	pkgver = r82.30626ff
+	pkgver = r90.27d2344
 	pkgrel = 1
 	url = https://github.com/aircrack-ng/rtl8814au
 	arch = x86_64
@@ -11,8 +11,10 @@ pkgbase = rtl8814au-aircrack-dkms-git
 	replaces = rtl8814au-dkms-git
 	source = rtl8814au::git+https://github.com/aircrack-ng/rtl8814au.git
 	source = dkms.conf
+	source = 5.11.patch
 	sha256sums = SKIP
 	sha256sums = b48a357efd1fd4365741c7cd5993619f60e518061e61fcb1c438f54b2d08149d
+	sha256sums = 9a4a28d0c33f0bc93aaf13f239821d523a2357968edd8478d03e9e1bd870c506
 
 pkgname = rtl8814au-aircrack-dkms-git
 
diff --git a/5.11.patch b/5.11.patch
new file mode 100644
index 000000000000..fbf84cfbe2bd
--- /dev/null
+++ b/5.11.patch
@@ -0,0 +1,14 @@
+--- src/rtl8814au/os_dep/linux/ioctl_cfg80211.c	2021-03-15 20:31:12.231848476 +0100
++++ src-new/rtl8814au/os_dep/linux/ioctl_cfg80211.c	2021-03-15 20:33:46.690845365 +0100
+@@ -460,7 +460,11 @@
+ 
+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0))
+ 	if (started) {
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 11, 0))
++		cfg80211_ch_switch_started_notify(adapter->pnetdev, &chdef, 0, false);
++#else
+ 		cfg80211_ch_switch_started_notify(adapter->pnetdev, &chdef, 0);
++#endif
+ 		goto exit;
+ 	}
+ #endif
diff --git a/PKGBUILD b/PKGBUILD
index 06b96747e73e..c293bd2cc04b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=rtl8814au-aircrack-dkms-git
 _pkgbase=rtl8814au
-pkgver=r82.30626ff
+pkgver=r90.27d2344
 pkgrel=1
 pkgdesc="Aircrack-ng kernel module for Realtek (USB adapters only) network cards with 8814au chipset"
 url="https://github.com/aircrack-ng/rtl8814au"
@@ -18,27 +18,35 @@ replaces=('rtl8814au-dkms-git')
 conflicts=('rtl8814au-dkms-git')
 
 source=('rtl8814au::git+https://github.com/aircrack-ng/rtl8814au.git'
-        'dkms.conf')
+        'dkms.conf'
+        '5.11.patch')
 
 sha256sums=('SKIP'
-            'b48a357efd1fd4365741c7cd5993619f60e518061e61fcb1c438f54b2d08149d')
+            'b48a357efd1fd4365741c7cd5993619f60e518061e61fcb1c438f54b2d08149d'
+            '9a4a28d0c33f0bc93aaf13f239821d523a2357968edd8478d03e9e1bd870c506')
 
 pkgver() {
-  cd ${srcdir}/${_pkgbase}
-  ( set -o pipefail
-    git describe --long 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
-    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-  )
+     cd ${srcdir}/${_pkgbase}
+     (
+        set -o pipefail
+         git describe --long 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
+         printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+     )
 }
 
-package() {
-	cd ${srcdir}/${_pkgbase}
-	mkdir -p ${pkgdir}/usr/src/${_pkgbase}-${pkgver}
-	cp -pr * ${pkgdir}/usr/src/${_pkgbase}-${pkgver}
-	cp ${srcdir}/dkms.conf ${pkgdir}/usr/src/${_pkgbase}-${pkgver}
-	
-	# Set name and version
-	sed -e "s/@_PKGBASE@/${_pkgbase}-dkms/" \
-            -e "s/@PKGVER@/${pkgver}/" \
-	    -i "${pkgdir}"/usr/src/${_pkgbase}-${pkgver}/dkms.conf
+prepare()
+{
+    patch -Np1 -i 5.11.patch
 }
+
+package() {
+    cd ${srcdir}/${_pkgbase}
+    mkdir -p ${pkgdir}/usr/src/${_pkgbase}-${pkgver}
+    cp -pr * ${pkgdir}/usr/src/${_pkgbase}-${pkgver}
+    cp ${srcdir}/dkms.conf ${pkgdir}/usr/src/${_pkgbase}-${pkgver}
+    
+    # Set name and version
+    sed -e "s/@_PKGBASE@/${_pkgbase}-dkms/" \
+        -e "s/@PKGVER@/${pkgver}/" \
+        -i "${pkgdir}"/usr/src/${_pkgbase}-${pkgver}/dkms.conf
+    }