summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorIyán Méndez Veiga2021-05-12 19:18:22 +0200
committerIyán Méndez Veiga2021-05-12 19:18:22 +0200
commitf239687ad5a4718190433d1616afd71b637f4163 (patch)
tree193c57629d3e46a3bb3f58ca658498b89362715a
parent08f5a269b1f1a14f75be0fb957d783297f4de4ab (diff)
downloadaur-f239687ad5a4718190433d1616afd71b637f4163.tar.gz
Add patch for kernel linux 5.12
-rw-r--r--.SRCINFO4
-rw-r--r--857.patch48
-rw-r--r--PKGBUILD31
3 files changed, 70 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 608d33711f9..6506c35d819 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = rtl88xxau-aircrack-dkms-git
pkgdesc = Aircrack-ng kernel module for Realtek 88XXau (USB adapters only) network cards (8811au, 8812au and 8821au chipsets) with monitor mode and injection support
- pkgver = r1123.e9fbf5c
+ pkgver = r1159.3a64331
pkgrel = 1
url = https://github.com/aircrack-ng/rtl8812au
arch = x86_64
@@ -14,8 +14,10 @@ pkgbase = rtl88xxau-aircrack-dkms-git
conflicts = rtl8812au-inject-dkms-git
source = rtl88xxau::git+https://github.com/aircrack-ng/rtl8812au.git#branch=v5.6.4.2
source = dkms.conf
+ source = 857.patch
sha256sums = SKIP
sha256sums = a1096f5141292aaf26e7556a170e8c9de86c4b6bb3fd3df48ee01996a223e56f
+ sha256sums = be1c0b9d9e0987461439d716e9964ed64a4d7ceac09ab5898734b2fecf66fc65
pkgname = rtl88xxau-aircrack-dkms-git
diff --git a/857.patch b/857.patch
new file mode 100644
index 00000000000..ca176b0a188
--- /dev/null
+++ b/857.patch
@@ -0,0 +1,48 @@
+From 9b4c60a89c2a55f36454b950a86246b6b86a9681 Mon Sep 17 00:00:00 2001
+From: KonstantIMP <mihedovkos@gmail.com>
+Date: Sat, 8 May 2021 22:14:57 +0300
+Subject: [PATCH 1/2] Add linux 5.12.x support Kernel with version >= 5.12.x
+ doesnt support GRO_DROP so the driver must be updated
+
+---
+ os_dep/linux/recv_linux.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/os_dep/linux/recv_linux.c b/os_dep/linux/recv_linux.c
+index 7fecc843..fc06a030 100644
+--- a/os_dep/linux/recv_linux.c
++++ b/os_dep/linux/recv_linux.c
+@@ -359,7 +359,8 @@ static int napi_recv(_adapter *padapter, int budget)
+ if (rtw_napi_gro_receive(&padapter->napi, pskb) != GRO_DROP)
+ rx_ok = _TRUE;
+ #else
+- rx_ok = _TRUE;
++ rtw_napi_gro_receive(&padapter->napi, pskb);
++ rx_ok = _TRUE;
+ #endif
+ goto next;
+ }
+
+From 1dfc05ad530e61d9f6f7d48c8ab85ac3ab6b4f85 Mon Sep 17 00:00:00 2001
+From: KonstantIMP <43513955+KonstantIMP@users.noreply.github.com>
+Date: Sat, 8 May 2021 22:18:14 +0300
+Subject: [PATCH 2/2] Add linux 5.12.x support
+
+Kernel with version >= 5.12.x doesnt support GRO_DROP so the driver must be updated
+---
+ os_dep/linux/recv_linux.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/os_dep/linux/recv_linux.c b/os_dep/linux/recv_linux.c
+index fc06a030..86a6d7d9 100644
+--- a/os_dep/linux/recv_linux.c
++++ b/os_dep/linux/recv_linux.c
+@@ -360,7 +360,7 @@ static int napi_recv(_adapter *padapter, int budget)
+ rx_ok = _TRUE;
+ #else
+ rtw_napi_gro_receive(&padapter->napi, pskb);
+- rx_ok = _TRUE;
++ rx_ok = _TRUE;
+ #endif
+ goto next;
+ }
diff --git a/PKGBUILD b/PKGBUILD
index b46f9d39e73..afef230fb52 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=rtl88xxau-aircrack-dkms-git
_pkgbase=rtl88xxau
-pkgver=r1123.e9fbf5c
+pkgver=r1159.3a64331
pkgrel=1
pkgdesc="Aircrack-ng kernel module for Realtek 88XXau (USB adapters only) network cards (8811au, 8812au and 8821au chipsets) with monitor mode and injection support"
url="https://github.com/aircrack-ng/rtl8812au"
@@ -15,27 +15,34 @@ depends=('dkms')
conflicts=('rtl8812au-aircrack-dkms-git' 'rtl8812au-dkms-git' 'rtl8821au-dkms-git' 'rtl8814au-dkms-git' 'rtl8812au-inject-dkms-git')
source=('rtl88xxau::git+https://github.com/aircrack-ng/rtl8812au.git#branch=v5.6.4.2'
- 'dkms.conf')
+ 'dkms.conf'
+ '857.patch')
sha256sums=('SKIP'
- 'a1096f5141292aaf26e7556a170e8c9de86c4b6bb3fd3df48ee01996a223e56f')
+ 'a1096f5141292aaf26e7556a170e8c9de86c4b6bb3fd3df48ee01996a223e56f'
+ 'be1c0b9d9e0987461439d716e9964ed64a4d7ceac09ab5898734b2fecf66fc65')
pkgver() {
- cd ${srcdir}/${_pkgbase}
+ 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)"
)
}
+prepare() {
+ cd "${srcdir}/${_pkgbase}"
+ patch --forward --strip=1 --input="${srcdir}/857.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/" \
+ 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
+ -i "${pkgdir}"/usr/src/${_pkgbase}-${pkgver}/dkms.conf
}