JDM170/build
1
0
Fork 0
mirror of https://github.com/armbian/build synced 2025-09-24 19:47:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit dc9f751012.
This commit is contained in:
Vyacheslav Bocharov
2023-05-02 11:18:19 +03:00
committed by Vyacheslav
parent 3767729dc5
commit 64f434ab33
2 changed files with 1 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/functions/compilation/patch/drivers_network.sh
View File

@@ -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

38
patch/misc/wireless-rtl88x2cs-6.3.0.patch
View File

@@ -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