From e2fa720f1d0ef4e197cbab0fd1a00329917a1194 Mon Sep 17 00:00:00 2001 From: Rob Logan Date: Fri, 6 Aug 2021 02:19:09 -0400 Subject: [PATCH] Updated_Upstream_rtl88x2bu (#3083) * Updated_Upstream_rtl88x2bu * Updated_Upstream_rtl88x2bu --- lib/compilation-prepare.sh | 5 +--- patch/misc/wireless-realtek-88x2bu-5.12.patch | 30 ------------------- 2 files changed, 1 insertion(+), 34 deletions(-) delete mode 100644 patch/misc/wireless-realtek-88x2bu-5.12.patch diff --git a/lib/compilation-prepare.sh b/lib/compilation-prepare.sh index 495676a54b..6d39b4a7de 100644 --- a/lib/compilation-prepare.sh +++ b/lib/compilation-prepare.sh @@ -510,7 +510,7 @@ compilation_prepare() if linux-version compare "${version}" ge 3.14 && [ "$EXTRAWIFI" == yes ]; then # attach to specifics tag or branch - local rtl88x2buver="branch:5.6.1_30362.20181109_COEX20180928-6a6a" + local rtl88x2buver="branch:5.8.7.1_35809.20191129_COEX20191120-7777" display_alert "Adding" "Wireless drivers for Realtek 88x2bu chipsets ${rtl88x2buver}" "info" @@ -539,9 +539,6 @@ compilation_prepare() sed -i '/source "drivers\/net\/wireless\/ti\/Kconfig"/a source "drivers\/net\/wireless\/rtl88x2bu\/Kconfig"' \ "$kerneldir/drivers/net/wireless/Kconfig" - # add support for K5.12+ - process_patch_file "${SRC}/patch/misc/wireless-realtek-88x2bu-5.12.patch" "applying" - fi diff --git a/patch/misc/wireless-realtek-88x2bu-5.12.patch b/patch/misc/wireless-realtek-88x2bu-5.12.patch deleted file mode 100644 index 668d1b927c..0000000000 --- a/patch/misc/wireless-realtek-88x2bu-5.12.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 0c05c48ee97d1b1ff12d4b752884b97c8d8109b6 Mon Sep 17 00:00:00 2001 -From: Igor Pecovnik -Date: Sun, 16 May 2021 16:26:19 +0200 -Subject: [PATCH] rtl88x2bu - -Signed-off-by: Igor Pecovnik ---- - drivers/net/wireless/rtl88x2bu/os_dep/linux/recv_linux.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/drivers/net/wireless/rtl88x2bu/os_dep/linux/recv_linux.c b/drivers/net/wireless/rtl88x2bu/os_dep/linux/recv_linux.c -index 6bd2e0946..7d793c983 100644 ---- a/drivers/net/wireless/rtl88x2bu/os_dep/linux/recv_linux.c -+++ b/drivers/net/wireless/rtl88x2bu/os_dep/linux/recv_linux.c -@@ -355,8 +355,12 @@ static int napi_recv(_adapter *padapter, int budget) - - #ifdef CONFIG_RTW_GRO - if (pregistrypriv->en_gro) { -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 12, 0) - if (rtw_napi_gro_receive(&padapter->napi, pskb) != GRO_DROP) - rx_ok = _TRUE; -+#else -+ rx_ok = _TRUE; -+#endif - goto next; - } - #endif /* CONFIG_RTW_GRO */ --- -Created with Armbian build tools https://github.com/armbian/build -