[gentoo-commits] repo/proj/guru:dev commit in: net-wireless/rtl8821cu/, net-wireless/rtl8821cu/files/

[gentoo-commits] repo/proj/guru:dev commit in: net-wireless/rtl8821cu/, net-wireless/rtl8821cu/files/

[Aleksandr Batyuk]

commit:     5cd2a4f68597cdbdfcc91c3f42ccabe70a9228ad
Author:     Aleksandr Batyuk <abbat.2008 <AT> gmail <DOT> com>
AuthorDate: Fri May  7 10:06:56 2021 +0000
Commit:     Aleksandr Batyuk <abbat.2008 <AT> gmail <DOT> com>
CommitDate: Fri May  7 10:06:56 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5cd2a4f6

net-wireless/rtl8821cu: Add support kernel 5.12

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Aleksandr Batyuk <abbat.2008 <AT> gmail.com>

 net-wireless/rtl8821cu/Manifest                    |  2 +-
 .../rtl8821cu/files/rtl8821cu-recv_linux.patch     | 29 ++++++++++++++++++++++
 ...01224.ebuild => rtl8821cu-0_pre20210327.ebuild} | 10 +++-----
 3 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/net-wireless/rtl8821cu/Manifest b/net-wireless/rtl8821cu/Manifest
index 9376bfea4..d7380941b 100644
--- a/net-wireless/rtl8821cu/Manifest
+++ b/net-wireless/rtl8821cu/Manifest
@@ -1 +1 @@
-DIST rtl8821cu-0_pre20201224.tar.gz 3646547 BLAKE2B f4cfca8afd858fc9d6ba715a84475f169fc5c81185171f68a13a526b637cc3bc46b993204db036a504a0e8ace817e0e739e5bb52ade146926df720b36b55c7cc SHA512 4423cf9b82f398f24fe1b677b487e750e4a0cb55a60eebf568ae92745f5d85efb953d9274ca0d06e84d3f347f9d91bab260a2a4eb92a92933dab9fdd6fa0d354
+DIST rtl8821cu-0_pre20210327.tar.gz 3645945 BLAKE2B c88a7c3917a184c62a9337ad29f4be1de03fc2494c9d58f3cea657f35b5d41c6f935b502758ffedf63fada15f3a42033de0fa67d65df59cde6aa76767065d759 SHA512 510dc443b1ed4dad35a858b71ae801fb134cbdfd79f6f171547aa7ffdaa9100309cb5303555a14b9492ead77ff7637aa28a25b3d4ce1545b906a83c1a3a041eb

diff --git a/net-wireless/rtl8821cu/files/rtl8821cu-recv_linux.patch b/net-wireless/rtl8821cu/files/rtl8821cu-recv_linux.patch
new file mode 100644
index 000000000..d6636ff6a
--- /dev/null
+++ b/net-wireless/rtl8821cu/files/rtl8821cu-recv_linux.patch
@@ -0,0 +1,29 @@
+--- /os_dep/linux/recv_linux.c	2020-12-24 16:55:47.000000000 +0600
++++ /os_dep/linux/recv_linux.c	2021-05-07 15:06:13.043463838 +0600
+@@ -353,7 +353,7 @@
+ 
+ 		rx_ok = _FALSE;
+ 
+-#ifdef CONFIG_RTW_GRO
++#if defined (CONFIG_RTW_GRO) && LINUX_VERSION_CODE < KERNEL_VERSION(5, 12, 0)
+ 		if (pregistrypriv->en_gro) {
+ 			if (rtw_napi_gro_receive(&padapter->napi, pskb) != GRO_DROP)
+ 				rx_ok = _TRUE;
+@@ -400,7 +400,7 @@
+ 	if (adapter->registrypriv.en_napi) {
+ 		struct dvobj_priv *dvobj;
+ 		struct registry_priv *registry;
+-	
++
+ 		dvobj = adapter_to_dvobj(adapter);
+ 		registry = &adapter->registrypriv;
+ 		if (dvobj->traffic_stat.cur_rx_tp > registry->napi_threshold)
+@@ -511,7 +511,7 @@
+ #ifdef CONFIG_RTW_NAPI
+ #ifdef CONFIG_RTW_NAPI_DYNAMIC
+ 		if (!skb_queue_empty(&precvpriv->rx_napi_skb_queue)
+-			&& !adapter_to_dvobj(padapter)->en_napi_dynamic			
++			&& !adapter_to_dvobj(padapter)->en_napi_dynamic
+ 			)
+ 			napi_recv(padapter, RTL_NAPI_WEIGHT);
+ #endif

diff --git a/net-wireless/rtl8821cu/rtl8821cu-0_pre20201224.ebuild b/net-wireless/rtl8821cu/rtl8821cu-0_pre20210327.ebuild
similarity index 69%
rename from net-wireless/rtl8821cu/rtl8821cu-0_pre20201224.ebuild
rename to net-wireless/rtl8821cu/rtl8821cu-0_pre20210327.ebuild
index 673fb01d9..fe5774715 100644
--- a/net-wireless/rtl8821cu/rtl8821cu-0_pre20201224.ebuild
+++ b/net-wireless/rtl8821cu/rtl8821cu-0_pre20210327.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 inherit linux-mod
 
-COMMIT="deff094b9d361b75dd3522aab4eb7f2ca3f3b0be"
+COMMIT="f1bc7e86c4a1c67bee04c361dd978683869d2347"
 
 DESCRIPTION="Realtek 8821CU/RTL8811CU module for Linux kernel"
 HOMEPAGE="https://github.com/brektrou/rtl8821CU"
@@ -19,9 +19,7 @@ S="${WORKDIR}/rtl8821CU-${COMMIT}"
 
 MODULE_NAMES="8821cu(net/wireless)"
 BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
 
-pkg_setup() {
-	linux-mod_pkg_setup
-	BUILD_PARAMS="KERN_DIR=${KV_DIR} ARCH=$(uname -m | sed -e s/i.86/i386/) KSRC=${KV_DIR} KERN_VER=${KV_FULL}"
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-recv_linux.patch
+)