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

Fixup for stale kickoff removal in wireless regulator API

Browse Source 
Cope with the fix in stable 6.3.13 bf353116d1bf and 6.5-rc1 e8c2af660ba0
"wifi: cfg80211: fix regulatory disconnect with OCB/NAN".
That is the removal of REGULATORY_IGNORE_STALE_KICKOFF
from the wireless regulator internal API to fix any driver
that allowed OCB/NAN.

Note this code will need to be expanded once and if 6.4 include the
above fixup.

Signed-off-by: Alban Browaeys <alban.browaeys@gmail.com>
This commit is contained in:
Alban Browaeys
2023-07-17 21:24:51 +02:00
committed by Igor
parent ad82607be3
commit 99ca2142a6
2 changed files with 44 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -395,6 +395,9 @@ driver_rtl88x2bu() {
# fix compilation for kernels >= 6.3
process_patch_file "${SRC}/patch/misc/wireless-rtl88x2bu-6.3.0.patch" "applying"
# fix compilation for kernels >= 6.3.13 < 6.4 and >= 6.5
process_patch_file "${SRC}/patch/misc/wireless-rtl88x2bu-wireless-ignore-stale-kickoff-removal.patch" "applying"
fi
}

41
patch/misc/wireless-rtl88x2bu-wireless-ignore-stale-kickoff-removal.patch Normal file
View File

@@ -0,0 +1,41 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Alban Browaeys <alban.browaeys@gmail.com>
Date: Sun, 16 Jul 2023 21:21:12 +0000
Subject: Fixup for stale kickoff removal in wireless regulator API
Cope with the fix in stable 6.3.13 bf353116d1bf and 6.5-rc1 e8c2af660ba0
"wifi: cfg80211: fix regulatory disconnect with OCB/NAN".
That is the removal of REGULATORY_IGNORE_STALE_KICKOFF
from the wireless regulator internal API to fix any driver
that allowed OCB/NAN.
Note this code will need to be expanded once and if 6.4 include the
above fixup.
---
drivers/net/wireless/rtl88x2bu/os_dep/linux/wifi_regd.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/rtl88x2bu/os_dep/linux/wifi_regd.c b/drivers/net/wireless/rtl88x2bu/os_dep/linux/wifi_regd.c
index 81e1dc75e5fb..04dc056f8d69 100644
--- a/drivers/net/wireless/rtl88x2bu/os_dep/linux/wifi_regd.c
+++ b/drivers/net/wireless/rtl88x2bu/os_dep/linux/wifi_regd.c
@@ -403,11 +403,14 @@ int rtw_regd_init(struct wiphy *wiphy)
#else
wiphy->regulatory_flags &= ~REGULATORY_STRICT_REG;
wiphy->regulatory_flags &= ~REGULATORY_DISABLE_BEACON_HINTS;
#endif
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0)) \
+ && ((LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 13)) \
+ || (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 4, 0))) \
+ && (LINUX_VERSION_CODE < KERNEL_VERSION(6, 5, 0))
wiphy->regulatory_flags |= REGULATORY_IGNORE_STALE_KICKOFF;
#endif
return 0;
}
--
Created with Armbian build tools https://github.com/armbian/build