From 4034a8f53578a6cf5a02e8993d32f21d3c293be4 Mon Sep 17 00:00:00 2001
From: iav <iav@iav.lv>
Date: Mon, 7 Feb 2022 10:52:39 +0200
Subject: [PATCH] switch RTL8188EU USB WiFi driver with 5.15+ kernel to
 mainline (#3464)

https://www.phoronix.com/scan.php?page=news_item&px=Linux-5.15-Staging
---
 config/kernel/linux-imx6-edge.config       | 2 +-
 config/kernel/linux-meson-edge.config      | 2 +-
 config/kernel/linux-meson64-edge.config    | 2 +-
 config/kernel/linux-mvebu64-edge.config    | 2 +-
 config/kernel/linux-rk35xx-edge.config     | 2 +-
 config/kernel/linux-rockchip-edge.config   | 2 +-
 config/kernel/linux-rockchip64-edge.config | 2 +-
 config/kernel/linux-sunxi-edge.config      | 2 +-
 config/kernel/linux-sunxi64-edge.config    | 2 +-
 lib/compilation-prepare.sh                 | 4 +++-
 10 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/config/kernel/linux-imx6-edge.config b/config/kernel/linux-imx6-edge.config
index 52df152fa..af3d16181 100644
--- a/config/kernel/linux-imx6-edge.config
+++ b/config/kernel/linux-imx6-edge.config
@@ -8420,7 +8420,7 @@ CONFIG_RTLLIB_CRYPTO_WEP=m
 CONFIG_RTL8192E=m
 CONFIG_RTL8723BS=m
 CONFIG_R8712U=m
-# CONFIG_R8188EU is not set
+CONFIG_R8188EU=m
 # CONFIG_RTS5208 is not set
 # CONFIG_VT6655 is not set
 # CONFIG_VT6656 is not set
diff --git a/config/kernel/linux-meson-edge.config b/config/kernel/linux-meson-edge.config
index 45f3fc90c..f3ff37b38 100644
--- a/config/kernel/linux-meson-edge.config
+++ b/config/kernel/linux-meson-edge.config
@@ -7152,7 +7152,7 @@ CONFIG_STAGING=y
 # CONFIG_RTLLIB is not set
 CONFIG_RTL8723BS=m
 CONFIG_R8712U=m
-# CONFIG_R8188EU is not set
+CONFIG_R8188EU=m
 # CONFIG_RTS5208 is not set
 # CONFIG_VT6655 is not set
 # CONFIG_VT6656 is not set
diff --git a/config/kernel/linux-meson64-edge.config b/config/kernel/linux-meson64-edge.config
index d6a0985f2..5928c6203 100644
--- a/config/kernel/linux-meson64-edge.config
+++ b/config/kernel/linux-meson64-edge.config
@@ -7743,7 +7743,7 @@ CONFIG_RTLLIB_CRYPTO_WEP=m
 CONFIG_RTL8192E=m
 CONFIG_RTL8723BS=m
 CONFIG_R8712U=m
-# CONFIG_R8188EU is not set
+CONFIG_R8188EU=m
 CONFIG_RTS5208=m
 CONFIG_VT6655=m
 CONFIG_VT6656=m
diff --git a/config/kernel/linux-mvebu64-edge.config b/config/kernel/linux-mvebu64-edge.config
index 7b6fa919d..ef33e1a6d 100644
--- a/config/kernel/linux-mvebu64-edge.config
+++ b/config/kernel/linux-mvebu64-edge.config
@@ -6063,7 +6063,7 @@ CONFIG_STAGING=y
 # CONFIG_RTLLIB is not set
 CONFIG_RTL8723BS=m
 # CONFIG_R8712U is not set
-# CONFIG_R8188EU is not set
+CONFIG_R8188EU=m
 # CONFIG_RTS5208 is not set
 CONFIG_VT6655=m
 CONFIG_VT6656=m
diff --git a/config/kernel/linux-rk35xx-edge.config b/config/kernel/linux-rk35xx-edge.config
index 3a51fdab9..e29012da5 100644
--- a/config/kernel/linux-rk35xx-edge.config
+++ b/config/kernel/linux-rk35xx-edge.config
@@ -7288,7 +7288,7 @@ CONFIG_RTLLIB_CRYPTO_WEP=m
 CONFIG_RTL8192E=m
 CONFIG_RTL8723BS=m
 CONFIG_R8712U=m
-# CONFIG_R8188EU is not set
+CONFIG_R8188EU=m
 CONFIG_RTS5208=m
 CONFIG_VT6655=m
 CONFIG_VT6656=m
diff --git a/config/kernel/linux-rockchip-edge.config b/config/kernel/linux-rockchip-edge.config
index 1eeca2f27..5826b9791 100644
--- a/config/kernel/linux-rockchip-edge.config
+++ b/config/kernel/linux-rockchip-edge.config
@@ -5676,7 +5676,7 @@ CONFIG_STAGING=y
 # CONFIG_RTLLIB is not set
 CONFIG_RTL8723BS=m
 CONFIG_R8712U=m
-# CONFIG_R8188EU is not set
+CONFIG_R8188EU=m
 # CONFIG_VT6656 is not set
 
 #
diff --git a/config/kernel/linux-rockchip64-edge.config b/config/kernel/linux-rockchip64-edge.config
index cf307ecfd..6804f6bd6 100644
--- a/config/kernel/linux-rockchip64-edge.config
+++ b/config/kernel/linux-rockchip64-edge.config
@@ -7254,7 +7254,7 @@ CONFIG_RTLLIB_CRYPTO_WEP=m
 CONFIG_RTL8192E=m
 CONFIG_RTL8723BS=m
 CONFIG_R8712U=m
-# CONFIG_R8188EU is not set
+CONFIG_R8188EU=m
 CONFIG_RTS5208=m
 CONFIG_VT6655=m
 CONFIG_VT6656=m
diff --git a/config/kernel/linux-sunxi-edge.config b/config/kernel/linux-sunxi-edge.config
index 86126c06c..d5f59506f 100644
--- a/config/kernel/linux-sunxi-edge.config
+++ b/config/kernel/linux-sunxi-edge.config
@@ -6170,7 +6170,7 @@ CONFIG_STAGING=y
 # CONFIG_RTLLIB is not set
 CONFIG_RTL8723BS=m
 CONFIG_R8712U=m
-# CONFIG_R8188EU is not set
+CONFIG_R8188EU=m
 # CONFIG_VT6656 is not set
 
 #
diff --git a/config/kernel/linux-sunxi64-edge.config b/config/kernel/linux-sunxi64-edge.config
index 38aa5c7b5..393be404f 100644
--- a/config/kernel/linux-sunxi64-edge.config
+++ b/config/kernel/linux-sunxi64-edge.config
@@ -5985,7 +5985,7 @@ CONFIG_STAGING=y
 # CONFIG_RTLLIB is not set
 CONFIG_RTL8723BS=m
 CONFIG_R8712U=m
-# CONFIG_R8188EU is not set
+CONFIG_R8188EU=m
 # CONFIG_VT6656 is not set
 
 #
diff --git a/lib/compilation-prepare.sh b/lib/compilation-prepare.sh
index b54730730..4f1ecf011 100644
--- a/lib/compilation-prepare.sh
+++ b/lib/compilation-prepare.sh
@@ -467,7 +467,9 @@ compilation_prepare()
 
 	# Wireless drivers for Realtek 8188EU 8188EUS and 8188ETV chipsets
 
-	if linux-version compare "${version}" ge 3.14 && [ "$EXTRAWIFI" == yes ]; then
+	if linux-version compare "${version}" ge 3.14 \
+		&& linux-version compare "${version}" lt 5.15 \
+		&& [ "$EXTRAWIFI" == yes ]; then
 
 		# attach to specifics tag or branch
 		local rtl8188euver="branch:v5.7.6.1"