drivers_network: Sort drivers by Linux version

Also update RTW88 comment
armbian · ColorfulRhino · Jun 6, 2024 · Jun 6, 2024 · Jun 6, 2024 · Jun 6, 2024
commit 5a5d26b12928df7328119e7aa2513f3544c35607
@@ -126,49 +126,6 @@ driver_rtl8189FS() {
 	fi
 }
 
-driver_rtl8192EU() {
-
-	# Wireless drivers for Realtek 8192EU chipsets
-
-	# RTL8192EU is supported by mainline driver RTL8XXXU as seen in the Linux kernel folder at "drivers/net/wireless/realtek/rtl8xxxu/Kconfig"
-	if linux-version compare "${version}" ge 3.14 && linux-version compare "${version}" le 6.10; then
-
-		# Attach to specific commit (was "branch:realtek-4.4.x")
-		local rtl8192euver='commit:a5ac6789a78a4f5ca0bf157a0f62385ea034cb9c' # Commit date: May 18, 2024 (please update when updating commit ref)
-
-		display_alert "Adding" "Wireless drivers for Realtek 8192EU chipsets ${rtl8192euver}" "info"
-
-		fetch_from_repo "$GITHUB_SOURCE/Mange/rtl8192eu-linux-driver" "rtl8192eu" "${rtl8192euver}" "yes" # https://github.com/Mange/rtl8192eu-linux-driver
-		cd "$kerneldir" || exit
-		rm -rf "$kerneldir/drivers/net/wireless/rtl8192eu"
-		mkdir -p "$kerneldir/drivers/net/wireless/rtl8192eu/"
-		cp -R "${SRC}/cache/sources/rtl8192eu/${rtl8192euver#*:}"/{core,hal,include,os_dep,platform} \
-			"$kerneldir/drivers/net/wireless/rtl8192eu"
-
-		# Makefile
-		cp "${SRC}/cache/sources/rtl8192eu/${rtl8192euver#*:}/Makefile" \
-			"$kerneldir/drivers/net/wireless/rtl8192eu/Makefile"
-
-		# Kconfig
-		sed -i 's/---help---/help/g' "${SRC}/cache/sources/rtl8192eu/${rtl8192euver#*:}/Kconfig"
-		cp "${SRC}/cache/sources/rtl8192eu/${rtl8192euver#*:}/Kconfig" \
-			"$kerneldir/drivers/net/wireless/rtl8192eu/Kconfig"
-
-		# Add to section Makefile
-		echo "obj-\$(CONFIG_RTL8192EU) += rtl8192eu/" >> "$kerneldir/drivers/net/wireless/Makefile"
-		sed -i '/source "drivers\/net\/wireless\/ti\/Kconfig"/a source "drivers\/net\/wireless\/rtl8192eu\/Kconfig"' \
-			"$kerneldir/drivers/net/wireless/Kconfig"
-
-		process_patch_file "${SRC}/patch/misc/wireless-rtl8192eu-Fix-p2p-go-advertising.patch" "applying"
-
-		# fix compilation for kernels >= 5.4
-		process_patch_file "${SRC}/patch/misc/wireless-rtl8192eu-Fix-VFS-import.patch" "applying"
-
-		# fix compilation for kernels >= 5.4.251
-		process_patch_file "${SRC}/patch/misc/wireless-rtl8192eu-Fix-building-on-5.4.251-kernel.patch" "applying"
-	fi
-}
-
 driver_rtl8811_rtl8812_rtl8814_rtl8821() {
 
 	# Wireless drivers for Realtek 8811, 8812, 8814 and 8821 chipsets
@@ -249,49 +206,6 @@ driver_xradio_xr819() {
 	fi
 }
 
-driver_rtl8811CU_rtl8821C() {
-	# Wireless drivers for Realtek RTL8811CU and RTL8821C chipsets
-
-	# Support for these chips is included in the mainline RTW88 driver as seen in this commit for example:
-	# https://github.com/torvalds/linux/commit/605d7c0b05eecb985273b1647070497142c470d3
-	if linux-version compare "${version}" ge 3.14 && linux-version compare "${version}" le 6.10; then
-
-		# Attach to specific commit (is branch:main)
-		local rtl8811cuver="commit:3eacc28b721950b51b0249508cc31e6e54988a0c" # Commit date: May 3, 2024 (please update when updating commit ref)
-
-		display_alert "Adding" "Wireless drivers for Realtek RTL8811CU and RTL8821C chipsets ${rtl8811cuver}" "info"
-
-		fetch_from_repo "$GITHUB_SOURCE/morrownr/8821cu-20210916" "rtl8811cu" "${rtl8811cuver}" "yes" # https://github.com/morrownr/8821cu-20210916
-		cd "$kerneldir" || exit
-		rm -rf "$kerneldir/drivers/net/wireless/rtl8811cu"
-		mkdir -p "$kerneldir/drivers/net/wireless/rtl8811cu/"
-		cp -R "${SRC}/cache/sources/rtl8811cu/${rtl8811cuver#*:}"/{core,hal,include,os_dep,platform,*.mk} \
-			"$kerneldir/drivers/net/wireless/rtl8811cu"
-
-		# Makefile
-		cp "${SRC}/cache/sources/rtl8811cu/${rtl8811cuver#*:}/Makefile" \
-			"$kerneldir/drivers/net/wireless/rtl8811cu/Makefile"
-
-		# Kconfig
-		sed -i 's/---help---/help/g' "${SRC}/cache/sources/rtl8811cu/${rtl8811cuver#*:}/Kconfig"
-		cp "${SRC}/cache/sources/rtl8811cu/${rtl8811cuver#*:}/Kconfig" \
-			"$kerneldir/drivers/net/wireless/rtl8811cu/Kconfig"
-
-		# Disable debug
-		sed -i "s/^CONFIG_RTW_DEBUG.*/CONFIG_RTW_DEBUG = n/" \
-			"$kerneldir/drivers/net/wireless/rtl8811cu/Makefile"
-
-		# Address ARM related bug $GITHUB_SOURCE/aircrack-ng/rtl8812au/issues/233
-		sed -i "s/^CONFIG_MP_VHT_HW_TX_MODE.*/CONFIG_MP_VHT_HW_TX_MODE = n/" \
-			"$kerneldir/drivers/net/wireless/rtl8811cu/Makefile"
-
-		# Add to section Makefile
-		echo "obj-\$(CONFIG_RTL8821CU) += rtl8811cu/" >> "$kerneldir/drivers/net/wireless/Makefile"
-		sed -i '/source "drivers\/net\/wireless\/ti\/Kconfig"/a source "drivers\/net\/wireless\/rtl8811cu\/Kconfig"' \
-			"$kerneldir/drivers/net/wireless/Kconfig"
-	fi
-}
-
 driver_rtl88x2bu() {
 
 	# Wireless drivers for Realtek 88x2bu chipsets
@@ -334,7 +248,7 @@ driver_rtl88x2bu() {
 driver_rtw88() {
 
 	# Upstream wireless RTW88 drivers
-	# Quite a few kernel families have KERNEL_DRIVERS_SKIP listing this driver. If so, this won't even be called.
+	# Some vendor kernels and Collabora kernel have KERNEL_DRIVERS_SKIP listing this driver. If so, this won't even be called.
 
 	if linux-version compare "${version}" ge 6.1; then
 		display_alert "Adding" "Upstream wireless RTW88 drivers" "info"
@@ -459,6 +373,147 @@ driver_uwe5622() {
 	fi
 }
 
+###  The vendor's RTL8723DS driver is still required for RockPI-S support because
+###  the RTW88 driver for the chip configures its RF gains incorrectly
+driver_rtl8723DS() {
+
+	# Wireless drivers for Realtek 8723DS chipsets
+
+	if linux-version compare "${version}" ge 5.0; then
+
+		# Attach to specific commit (was "branch:master")
+		local rtl8723dsver='commit:52e593e8c889b68ba58bd51cbdbcad7fe71362e4' # Commit date: Nov 14, 2023 (please update when updating commit ref)
+
+		display_alert "Adding" "Wireless drivers for Realtek 8723DS chipsets ${rtl8723dsver}" "info"
+
+		fetch_from_repo "$GITHUB_SOURCE/lwfinger/rtl8723ds" "rtl8723ds" "${rtl8723dsver}" "yes" # https://github.com/lwfinger/rtl8723ds
+		cd "$kerneldir" || exit
+		rm -rf "$kerneldir/drivers/net/wireless/rtl8723ds"
+		mkdir -p "$kerneldir/drivers/net/wireless/rtl8723ds/"
+		cp -R "${SRC}/cache/sources/rtl8723ds/${rtl8723dsver#*:}"/{core,hal,include,os_dep,platform} \
+			"$kerneldir/drivers/net/wireless/rtl8723ds"
+
+		# Makefile
+		cp "${SRC}/cache/sources/rtl8723ds/${rtl8723dsver#*:}/Makefile" \
+			"$kerneldir/drivers/net/wireless/rtl8723ds/Makefile"
+
+		# Kconfig
+		sed -i 's/---help---/help/g' "${SRC}/cache/sources/rtl8723ds/${rtl8723dsver#*:}/Kconfig"
+		cp "${SRC}/cache/sources/rtl8723ds/${rtl8723dsver#*:}/Kconfig" \
+			"$kerneldir/drivers/net/wireless/rtl8723ds/Kconfig"
+
+		# Disable debug
+		sed -i "s/^CONFIG_RTW_DEBUG.*/CONFIG_RTW_DEBUG = n/" \
+			"$kerneldir/drivers/net/wireless/rtl8723ds/Makefile"
+
+		# Add to section Makefile
+		echo "obj-\$(CONFIG_RTL8723DS) += rtl8723ds/" >> "$kerneldir/drivers/net/wireless/Makefile"
+		sed -i '/source "drivers\/net\/wireless\/ti\/Kconfig"/a source "drivers\/net\/wireless\/rtl8723ds\/Kconfig"' \
+			"$kerneldir/drivers/net/wireless/Kconfig"
+
+		process_patch_file "${SRC}/patch/misc/wireless-rtl8723ds-Fix-p2p-go-advertising.patch" "applying"
+
+		# fix compilation for kernels >= 5.4
+		process_patch_file "${SRC}/patch/misc/wireless-rtl8723ds-Fix-VFS-import.patch" "applying"
+	fi
+}
+
+###
+###
+### NOTICE: <=6.10 BELOW ONLY
+###
+### All drivers and patches listed below are only used in kernels <=6.10 and **not** in >=6.11
+### Sorted by: "linux-version le ..." from high (newer kernel) to low (older kernel).
+### It is sorted like this for better visibility.
+###
+### v v v v v v v v v v v v v v v v v v v v v v v
+
+driver_rtl8192EU() {
+
+	# Wireless drivers for Realtek 8192EU chipsets
+
+	# RTL8192EU is supported by mainline driver RTL8XXXU as seen in the Linux kernel folder at "drivers/net/wireless/realtek/rtl8xxxu/Kconfig"
+	if linux-version compare "${version}" ge 3.14 && linux-version compare "${version}" le 6.10; then
+
+		# Attach to specific commit (was "branch:realtek-4.4.x")
+		local rtl8192euver='commit:a5ac6789a78a4f5ca0bf157a0f62385ea034cb9c' # Commit date: May 18, 2024 (please update when updating commit ref)
+
+		display_alert "Adding" "Wireless drivers for Realtek 8192EU chipsets ${rtl8192euver}" "info"
+
+		fetch_from_repo "$GITHUB_SOURCE/Mange/rtl8192eu-linux-driver" "rtl8192eu" "${rtl8192euver}" "yes" # https://github.com/Mange/rtl8192eu-linux-driver
+		cd "$kerneldir" || exit
+		rm -rf "$kerneldir/drivers/net/wireless/rtl8192eu"
+		mkdir -p "$kerneldir/drivers/net/wireless/rtl8192eu/"
+		cp -R "${SRC}/cache/sources/rtl8192eu/${rtl8192euver#*:}"/{core,hal,include,os_dep,platform} \
+			"$kerneldir/drivers/net/wireless/rtl8192eu"
+
+		# Makefile
+		cp "${SRC}/cache/sources/rtl8192eu/${rtl8192euver#*:}/Makefile" \
+			"$kerneldir/drivers/net/wireless/rtl8192eu/Makefile"
+
+		# Kconfig
+		sed -i 's/---help---/help/g' "${SRC}/cache/sources/rtl8192eu/${rtl8192euver#*:}/Kconfig"
+		cp "${SRC}/cache/sources/rtl8192eu/${rtl8192euver#*:}/Kconfig" \
+			"$kerneldir/drivers/net/wireless/rtl8192eu/Kconfig"
+
+		# Add to section Makefile
+		echo "obj-\$(CONFIG_RTL8192EU) += rtl8192eu/" >> "$kerneldir/drivers/net/wireless/Makefile"
+		sed -i '/source "drivers\/net\/wireless\/ti\/Kconfig"/a source "drivers\/net\/wireless\/rtl8192eu\/Kconfig"' \
+			"$kerneldir/drivers/net/wireless/Kconfig"
+
+		process_patch_file "${SRC}/patch/misc/wireless-rtl8192eu-Fix-p2p-go-advertising.patch" "applying"
+
+		# fix compilation for kernels >= 5.4
+		process_patch_file "${SRC}/patch/misc/wireless-rtl8192eu-Fix-VFS-import.patch" "applying"
+
+		# fix compilation for kernels >= 5.4.251
+		process_patch_file "${SRC}/patch/misc/wireless-rtl8192eu-Fix-building-on-5.4.251-kernel.patch" "applying"
+	fi
+}
+
+driver_rtl8811CU_rtl8821C() {
+	# Wireless drivers for Realtek RTL8811CU and RTL8821C chipsets
+
+	# Support for these chips is included in the mainline RTW88 driver as seen in this commit for example:
+	# https://github.com/torvalds/linux/commit/605d7c0b05eecb985273b1647070497142c470d3
+	if linux-version compare "${version}" ge 3.14 && linux-version compare "${version}" le 6.10; then
+
+		# Attach to specific commit (is branch:main)
+		local rtl8811cuver="commit:3eacc28b721950b51b0249508cc31e6e54988a0c" # Commit date: May 3, 2024 (please update when updating commit ref)
+
+		display_alert "Adding" "Wireless drivers for Realtek RTL8811CU and RTL8821C chipsets ${rtl8811cuver}" "info"
+
+		fetch_from_repo "$GITHUB_SOURCE/morrownr/8821cu-20210916" "rtl8811cu" "${rtl8811cuver}" "yes" # https://github.com/morrownr/8821cu-20210916
+		cd "$kerneldir" || exit
+		rm -rf "$kerneldir/drivers/net/wireless/rtl8811cu"
+		mkdir -p "$kerneldir/drivers/net/wireless/rtl8811cu/"
+		cp -R "${SRC}/cache/sources/rtl8811cu/${rtl8811cuver#*:}"/{core,hal,include,os_dep,platform,*.mk} \
+			"$kerneldir/drivers/net/wireless/rtl8811cu"
+
+		# Makefile
+		cp "${SRC}/cache/sources/rtl8811cu/${rtl8811cuver#*:}/Makefile" \
+			"$kerneldir/drivers/net/wireless/rtl8811cu/Makefile"
+
+		# Kconfig
+		sed -i 's/---help---/help/g' "${SRC}/cache/sources/rtl8811cu/${rtl8811cuver#*:}/Kconfig"
+		cp "${SRC}/cache/sources/rtl8811cu/${rtl8811cuver#*:}/Kconfig" \
+			"$kerneldir/drivers/net/wireless/rtl8811cu/Kconfig"
+
+		# Disable debug
+		sed -i "s/^CONFIG_RTW_DEBUG.*/CONFIG_RTW_DEBUG = n/" \
+			"$kerneldir/drivers/net/wireless/rtl8811cu/Makefile"
+
+		# Address ARM related bug $GITHUB_SOURCE/aircrack-ng/rtl8812au/issues/233
+		sed -i "s/^CONFIG_MP_VHT_HW_TX_MODE.*/CONFIG_MP_VHT_HW_TX_MODE = n/" \
+			"$kerneldir/drivers/net/wireless/rtl8811cu/Makefile"
+
+		# Add to section Makefile
+		echo "obj-\$(CONFIG_RTL8821CU) += rtl8811cu/" >> "$kerneldir/drivers/net/wireless/Makefile"
+		sed -i '/source "drivers\/net\/wireless\/ti\/Kconfig"/a source "drivers\/net\/wireless\/rtl8811cu\/Kconfig"' \
+			"$kerneldir/drivers/net/wireless/Kconfig"
+	fi
+}
+
 driver_rtl8723cs() {
 
 	# Wireless drivers for Realtek rtl8723cs chipsets
@@ -541,51 +596,6 @@ driver_rtl8723cs() {
 
 }
 
-###  The vendor's RTL8723DS driver is still required for RockPI-S support because
-###  the RTW88 driver for the chip configures its RF gains incorrectly
-driver_rtl8723DS() {
-
-	# Wireless drivers for Realtek 8723DS chipsets
-
-	if linux-version compare "${version}" ge 5.0; then
-
-		# Attach to specific commit (was "branch:master")
-		local rtl8723dsver='commit:52e593e8c889b68ba58bd51cbdbcad7fe71362e4' # Commit date: Nov 14, 2023 (please update when updating commit ref)
-
-		display_alert "Adding" "Wireless drivers for Realtek 8723DS chipsets ${rtl8723dsver}" "info"
-
-		fetch_from_repo "$GITHUB_SOURCE/lwfinger/rtl8723ds" "rtl8723ds" "${rtl8723dsver}" "yes" # https://github.com/lwfinger/rtl8723ds
-		cd "$kerneldir" || exit
-		rm -rf "$kerneldir/drivers/net/wireless/rtl8723ds"
-		mkdir -p "$kerneldir/drivers/net/wireless/rtl8723ds/"
-		cp -R "${SRC}/cache/sources/rtl8723ds/${rtl8723dsver#*:}"/{core,hal,include,os_dep,platform} \
-			"$kerneldir/drivers/net/wireless/rtl8723ds"
-
-		# Makefile
-		cp "${SRC}/cache/sources/rtl8723ds/${rtl8723dsver#*:}/Makefile" \
-			"$kerneldir/drivers/net/wireless/rtl8723ds/Makefile"
-
-		# Kconfig
-		sed -i 's/---help---/help/g' "${SRC}/cache/sources/rtl8723ds/${rtl8723dsver#*:}/Kconfig"
-		cp "${SRC}/cache/sources/rtl8723ds/${rtl8723dsver#*:}/Kconfig" \
-			"$kerneldir/drivers/net/wireless/rtl8723ds/Kconfig"
-
-		# Disable debug
-		sed -i "s/^CONFIG_RTW_DEBUG.*/CONFIG_RTW_DEBUG = n/" \
-			"$kerneldir/drivers/net/wireless/rtl8723ds/Makefile"
-
-		# Add to section Makefile
-		echo "obj-\$(CONFIG_RTL8723DS) += rtl8723ds/" >> "$kerneldir/drivers/net/wireless/Makefile"
-		sed -i '/source "drivers\/net\/wireless\/ti\/Kconfig"/a source "drivers\/net\/wireless\/rtl8723ds\/Kconfig"' \
-			"$kerneldir/drivers/net/wireless/Kconfig"
-
-		process_patch_file "${SRC}/patch/misc/wireless-rtl8723ds-Fix-p2p-go-advertising.patch" "applying"
-
-		# fix compilation for kernels >= 5.4
-		process_patch_file "${SRC}/patch/misc/wireless-rtl8723ds-Fix-VFS-import.patch" "applying"
-	fi
-}
-
 ###
 ###
 ### NOTICE: <=6.7 BELOW ONLY