From b8e595aef43709644cd2d3123aa6e69631e40129 Mon Sep 17 00:00:00 2001
From: Ricardo Pardini <ricardo@pardini.net>
Date: Wed, 4 Jan 2023 15:34:10 +0100
Subject: [PATCH] armbian-next: `drivers-harness`: include the revert-IPX patch
 as a "driver" before all others

---
 lib/functions/compilation/patch/drivers-harness.sh |  1 +
 lib/functions/compilation/patch/drivers_network.sh | 13 ++++++++++++-
 lib/functions/compilation/patch/kernel-drivers.sh  | 11 -----------
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/lib/functions/compilation/patch/drivers-harness.sh b/lib/functions/compilation/patch/drivers-harness.sh
index 7c460fdac..891ae5c81 100644
--- a/lib/functions/compilation/patch/drivers-harness.sh
+++ b/lib/functions/compilation/patch/drivers-harness.sh
@@ -55,6 +55,7 @@ function kernel_drivers_prepare_harness() {
 	declare -I target_patch_file # outer scope variable
 
 	declare -a drivers=(
+		driver_generic_bring_back_ipx
 		driver_rtl8152_rtl8153
 		driver_rtl8189ES
 		driver_rtl8189FS
diff --git a/lib/functions/compilation/patch/drivers_network.sh b/lib/functions/compilation/patch/drivers_network.sh
index b54e40adc..b98904f0d 100644
--- a/lib/functions/compilation/patch/drivers_network.sh
+++ b/lib/functions/compilation/patch/drivers_network.sh
@@ -1,5 +1,15 @@
 #!/bin/bash
 
+function driver_generic_bring_back_ipx() {
+	#
+	# Returning headers needed for some wireless drivers
+	#
+	if linux-version compare "${version}" ge 5.4 && [ $EXTRAWIFI == yes ]; then
+		display_alert "Reverting upstream-removed" "IPX stuff needed for Wireless Drivers" "info"
+		process_patch_file "${SRC}/patch/misc/wireless-bring-back-headers.patch" "applying"
+	fi
+}
+
 driver_rtl8152_rtl8153()
 {
 	# Updated USB network drivers for RTL8152/RTL8153 based dongles that also support 2.5Gbs variants
@@ -572,7 +582,8 @@ driver_uwe5622_allwinner()
 patch_drivers_network()
 {
 	display_alert "Patching network related drivers"
-
+	
+	driver_generic_bring_back_ipx
 	driver_rtl8152_rtl8153
 	driver_rtl8189ES
 	driver_rtl8189FS
diff --git a/lib/functions/compilation/patch/kernel-drivers.sh b/lib/functions/compilation/patch/kernel-drivers.sh
index b017f40aa..df12ae922 100644
--- a/lib/functions/compilation/patch/kernel-drivers.sh
+++ b/lib/functions/compilation/patch/kernel-drivers.sh
@@ -148,17 +148,6 @@ function prepare_extra_kernel_drivers() {
 
 	fi
 
-	#
-	# Returning headers needed for some wireless drivers
-	#
-
-	if linux-version compare "${version}" ge 5.4 && [ $EXTRAWIFI == yes ]; then
-
-		display_alert "Adding" "Missing headers" "info"
-		process_patch_file "${SRC}/patch/misc/wireless-bring-back-headers.patch" "applying"
-
-	fi
-
 	#
 	# mac80211 wireless driver injection features from Kali Linux
 	#