Преглед на файлове

Revert "fix rtl88x2cs compilation for kernel 6.3" as fixed in rtl88x2cs repository.

This reverts commit dc9f751012b43e690a9341d63bd6950709a4dd44.
Vyacheslav Bocharov преди 2 години
родител
ревизия
64f434ab33
променени са 2 файла, в които са добавени 1 реда и са изтрити 42 реда
  1. 1 4
      lib/functions/compilation/patch/drivers_network.sh
  2. 0 38
      patch/misc/wireless-rtl88x2cs-6.3.0.patch

+ 1 - 4
lib/functions/compilation/patch/drivers_network.sh

@@ -421,9 +421,6 @@ driver_rtl88x2cs() {
 
 		# fix compilation for kernels >= 5.4
 		process_patch_file "${SRC}/patch/misc/wireless-rtl88x2cs-Fix-VFS-import.patch" "applying"
-
-		# fix compilation for kernels >= 6.3
-		process_patch_file "${SRC}/patch/misc/wireless-rtl88x2cs-6.3.0.patch" "applying"
 	fi
 }
 #_bt for blueteeth
@@ -637,7 +634,7 @@ driver_rtl8723cs() {
 	if linux-version compare "${version}" ge 6.3; then
 		process_patch_file "${SRC}/patch/misc/wireless-rtl8723cs/8723cs-Port-to-6.3.patch" "applying"
 	fi
-
+	
 }
 
 patch_drivers_network() {

+ 0 - 38
patch/misc/wireless-rtl88x2cs-6.3.0.patch

@@ -1,38 +0,0 @@
-From f507578759ec1331a155299a3f6d9ed1daa93682 Mon Sep 17 00:00:00 2001
-From: Paolo Sabatino <paolo.sabatino@gmail.com>
-Date: Wed, 26 Apr 2023 21:03:07 +0000
-Subject: [PATCH] fix rtl88x2cs driver for kernel 6.3
-
----
- .../net/wireless/rtl88x2cs/os_dep/linux/ioctl_cfg80211.c    | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/net/wireless/rtl88x2cs/os_dep/linux/ioctl_cfg80211.c b/drivers/net/wireless/rtl88x2cs/os_dep/linux/ioctl_cfg80211.c
-index f1a5493663cf..4a28b8258c54 100644
---- a/drivers/net/wireless/rtl88x2cs/os_dep/linux/ioctl_cfg80211.c
-+++ b/drivers/net/wireless/rtl88x2cs/os_dep/linux/ioctl_cfg80211.c
-@@ -456,7 +456,9 @@
- 
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0))
- 	if (started) {
--		#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0))
-+		#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0))
-+		cfg80211_ch_switch_started_notify(adapter->pnetdev, &chdef, 0, 0, false, 0);
-+		#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0))
- 		cfg80211_ch_switch_started_notify(adapter->pnetdev, &chdef, 0, 0, false);
- 		#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 11, 0))
- 		cfg80211_ch_switch_started_notify(adapter->pnetdev, &chdef, 0, false);
-@@ -470,7 +472,9 @@
- 	if (!rtw_cfg80211_allow_ch_switch_notify(adapter))
- 		goto exit;
- 
--#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,19, 2))
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0))
-+	cfg80211_ch_switch_notify(adapter->pnetdev, &chdef, 0, 0);
-+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 2))
- 	cfg80211_ch_switch_notify(adapter->pnetdev, &chdef, 0);
- #else
- 	cfg80211_ch_switch_notify(adapter->pnetdev, &chdef);
--- 
-2.34.1
-