From 3d7e67431f5a37faa3b12f0aa58b12f1bb92f819 Mon Sep 17 00:00:00 2001 From: Julian Sikorski Date: Sat, 29 Jul 2023 11:30:32 +0000 Subject: [PATCH] Fix compiling rtl8189es, rtl8189fs and rtl8192eu --- .../compilation/patch/drivers_network.sh | 9 +++++++ ...189es-Fix-building-on-5.4.251-kernel.patch | 25 +++++++++++++++++++ ...189fs-Fix-building-on-5.4.251-kernel.patch | 25 +++++++++++++++++++ ...192eu-Fix-building-on-5.4.251-kernel.patch | 25 +++++++++++++++++++ 4 files changed, 84 insertions(+) create mode 100644 patch/misc/wireless-rtl8189es-Fix-building-on-5.4.251-kernel.patch create mode 100644 patch/misc/wireless-rtl8189fs-Fix-building-on-5.4.251-kernel.patch create mode 100644 patch/misc/wireless-rtl8192eu-Fix-building-on-5.4.251-kernel.patch diff --git a/lib/functions/compilation/patch/drivers_network.sh b/lib/functions/compilation/patch/drivers_network.sh index 33cef67f3..48a8cfc26 100644 --- a/lib/functions/compilation/patch/drivers_network.sh +++ b/lib/functions/compilation/patch/drivers_network.sh @@ -72,6 +72,9 @@ driver_rtl8189ES() { # fix compilation for kernels >= 5.4 process_patch_file "${SRC}/patch/misc/wireless-rtl8189es-Fix-VFS-import.patch" "applying" + + # fix compilation for kernels >= 5.4.251 + process_patch_file "${SRC}/patch/misc/wireless-rtl8189es-Fix-building-on-5.4.251-kernel.patch" "applying" fi } @@ -116,6 +119,9 @@ driver_rtl8189FS() { # fix compilation for kernels >= 5.4 process_patch_file "${SRC}/patch/misc/wireless-rtl8189fs-Fix-VFS-import.patch" "applying" + + # fix compilation for kernels >= 5.4.251 + process_patch_file "${SRC}/patch/misc/wireless-rtl8189fs-Fix-building-on-5.4.251-kernel.patch" "applying" fi } @@ -156,6 +162,9 @@ driver_rtl8192EU() { # 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 } diff --git a/patch/misc/wireless-rtl8189es-Fix-building-on-5.4.251-kernel.patch b/patch/misc/wireless-rtl8189es-Fix-building-on-5.4.251-kernel.patch new file mode 100644 index 000000000..382459d4d --- /dev/null +++ b/patch/misc/wireless-rtl8189es-Fix-building-on-5.4.251-kernel.patch @@ -0,0 +1,25 @@ +From c8b4455419a14a17be3585d475ec9c9df62a4d77 Mon Sep 17 00:00:00 2001 +From: Julian Sikorski +Date: Sat, 29 Jul 2023 10:50:50 +0000 +Subject: [PATCH] Fix building on 5.4.251+ kernel + +--- + include/osdep_service_linux.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/net/wireless/rtl8189es/include/osdep_service_linux.h b/drivers/net/wireless/rtl8189es/include/osdep_service_linux.h +index 15255cb..f4ed355 100644 +--- a/drivers/net/wireless/rtl8189es/include/osdep_service_linux.h ++++ b/drivers/net/wireless/rtl8189es/include/osdep_service_linux.h +@@ -220,7 +220,7 @@ typedef void *timer_hdl_context; + #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1)) + #endif + +-#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0)) ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 251)) + /* Porting from linux kernel commits + 48eab831ae8b9f7002a533fa4235eed63ea1f1a3 + 3f6cffb8604b537e3d7ea040d7f4368689638eaf +-- +2.34.1 + diff --git a/patch/misc/wireless-rtl8189fs-Fix-building-on-5.4.251-kernel.patch b/patch/misc/wireless-rtl8189fs-Fix-building-on-5.4.251-kernel.patch new file mode 100644 index 000000000..7dae3337c --- /dev/null +++ b/patch/misc/wireless-rtl8189fs-Fix-building-on-5.4.251-kernel.patch @@ -0,0 +1,25 @@ +From 036a79900b8645eb9948c1dd7e5e8a984ba1845e Mon Sep 17 00:00:00 2001 +From: Julian Sikorski +Date: Sat, 29 Jul 2023 11:16:28 +0000 +Subject: [PATCH] Fix building on 5.4.251+ kernel + +--- + include/osdep_service_linux.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/net/wireless/rtl8189fs/include/osdep_service_linux.h b/drivers/net/wireless/rtl8189fs/include/osdep_service_linux.h +index e1daa04..6c6d0d8 100644 +--- a/drivers/net/wireless/rtl8189fs/include/osdep_service_linux.h ++++ b/drivers/net/wireless/rtl8189fs/include/osdep_service_linux.h +@@ -219,7 +219,7 @@ typedef void *timer_hdl_context; + #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1)) + #endif + +-#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0)) ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 251)) + /* Porting from linux kernel commits + 48eab831ae8b9f7002a533fa4235eed63ea1f1a3 + 3f6cffb8604b537e3d7ea040d7f4368689638eaf +-- +2.34.1 + diff --git a/patch/misc/wireless-rtl8192eu-Fix-building-on-5.4.251-kernel.patch b/patch/misc/wireless-rtl8192eu-Fix-building-on-5.4.251-kernel.patch new file mode 100644 index 000000000..82d8bcafc --- /dev/null +++ b/patch/misc/wireless-rtl8192eu-Fix-building-on-5.4.251-kernel.patch @@ -0,0 +1,25 @@ +From 4889d0e19ef3563a14e5a4eb732108a949741a18 Mon Sep 17 00:00:00 2001 +From: Julian Sikorski +Date: Sat, 29 Jul 2023 11:43:00 +0000 +Subject: [PATCH] Fix building on 5.4.251+ kernel + +--- + include/osdep_service_linux.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/net/wireless/rtl8192eu/include/osdep_service_linux.h b/drivers/net/wireless/rtl8192eu/include/osdep_service_linux.h +index 8ade04f..3f8b0fa 100644 +--- a/drivers/net/wireless/rtl8192eu/include/osdep_service_linux.h ++++ b/drivers/net/wireless/rtl8192eu/include/osdep_service_linux.h +@@ -217,7 +217,7 @@ typedef void *timer_hdl_context; + + typedef unsigned long systime; + +-#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0)) ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 251)) + /* Porting from linux kernel v5.15-rc1 48eab831ae8b9f7002a533fa4235eed63ea1f1a3 */ + static inline void eth_hw_addr_set(struct net_device *dev, const u8 *addr) + { +-- +2.34.1 +