From 35ac42fc5672b0675e3d544e605baa3a9cb7f17b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Max=20G=C3=B6rner?= <5477952+MaxG87@users.noreply.github.com> Date: Fri, 19 Jan 2024 10:28:15 +0100 Subject: [PATCH 1/2] Remove puncturing bitmap from function calls In Linux Kernel commit b82730bf57b54803ab94abbfd8c4422a7081886d the last parameter was removed from two function signatures. Hence, it must not be passed by the driver too. Fortunately these were plain `0` anyways. --- os_dep/linux/ioctl_cfg80211.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c index 9bbecc2..12d7dd8 100755 --- a/os_dep/linux/ioctl_cfg80211.c +++ b/os_dep/linux/ioctl_cfg80211.c @@ -437,7 +437,9 @@ u8 rtw_cfg80211_ch_switch_notify(_adapter *adapter, u8 ch, u8 bw, u8 offset, #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0)) if (started) { - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0)) + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 9, 0)) + cfg80211_ch_switch_started_notify(adapter->pnetdev, &chdef, 0, 0, false); + #elif (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); @@ -453,7 +455,9 @@ u8 rtw_cfg80211_ch_switch_notify(_adapter *adapter, u8 ch, u8 bw, u8 offset, if (!rtw_cfg80211_allow_ch_switch_notify(adapter)) goto exit; -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0)) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 9, 0)) + cfg80211_ch_switch_notify(adapter->pnetdev, &chdef, 0); +#elif (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); From ad9f6a8a7c0760801d22822fa11e64482eda483f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Max=20G=C3=B6rner?= <5477952+MaxG87@users.noreply.github.com> Date: Tue, 21 May 2024 21:39:37 +0200 Subject: [PATCH 2/2] docs: Add note for compatibility with Linux v6.9 --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index eb9c85e..24a6e44 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,8 @@ Build confirmed on: * Linux version `6.5.5` (self compiled) on Debian Bookworm * Linux version `6.6.1` (self compiled) on Debian Bookworm * Linux version `6.7.2` (self compiled) on Debian Bookworm and Ubuntu 22.04 -* Linux version `6.8.0` (self compiled) on Debian Bookworm +* Linux version `6.8.8` (self compiled) on Debian Trixie +* Linux version `6.9.0` (self compiled) on Debian Trixie ## Using and Installing the Driver