mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-21 06:33:41 +00:00
e537ebbc23
ath10k-ct now offers 6.2 and 6.4 versions, so lets update to use 6.2 so we can get rid of the API update patch as well as NVMEM as that is already present in the newer driver. Ben merged the debug compilation patch so we can remove that one as well. Update patches to point to 6.2 version and refresh them. Signed-off-by: Robert Marko <robimarko@gmail.com>
33 lines
1.1 KiB
Diff
33 lines
1.1 KiB
Diff
From 0d2e335d780bda1432a9ba719c8200f796d27854 Mon Sep 17 00:00:00 2001
|
|
From: Robert Marko <robimarko@gmail.com>
|
|
Date: Mon, 29 Nov 2021 12:27:12 +0100
|
|
Subject: [PATCH] ath10k-ct: Fix spectral scan NULL pointer
|
|
|
|
If spectral scan support is enabled then ath10k-ct will cause a NULL
|
|
pointer due to relay_open() being called with a const callback struct
|
|
which is only supported in kernel 5.11 and later.
|
|
|
|
So, simply check the kernel version and if 5.11 and newer use the const
|
|
callback struct, otherwise use the regular struct.
|
|
|
|
Fixes: 553a3ac ("ath10k-ct: use 5.15 version")
|
|
Signed-off-by: Robert Marko <robimarko@gmail.com>
|
|
---
|
|
ath10k-6.2/spectral.c | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
--- a/ath10k-6.2/spectral.c
|
|
+++ b/ath10k-6.2/spectral.c
|
|
@@ -497,7 +497,11 @@ static int remove_buf_file_handler(struc
|
|
return 0;
|
|
}
|
|
|
|
+#if LINUX_VERSION_IS_GEQ(5,11,0)
|
|
static const struct rchan_callbacks rfs_spec_scan_cb = {
|
|
+#else
|
|
+static struct rchan_callbacks rfs_spec_scan_cb = {
|
|
+#endif
|
|
.create_buf_file = create_buf_file_handler,
|
|
.remove_buf_file = remove_buf_file_handler,
|
|
};
|