From 3e28c86a05c7c46b6272ee5ec42e51f49f4502c6 Mon Sep 17 00:00:00 2001 From: Paolo Sabatino Date: Wed, 26 Apr 2023 21:15:04 +0000 Subject: [PATCH] fix rtl8811cu compilation for kernel 6.3 --- .../compilation/patch/drivers_network.sh | 4 ++ patch/misc/wireless-rtl8811cu-6.3.patch | 38 +++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 patch/misc/wireless-rtl8811cu-6.3.patch diff --git a/lib/functions/compilation/patch/drivers_network.sh b/lib/functions/compilation/patch/drivers_network.sh index f74900abb2..5793b22a7b 100644 --- a/lib/functions/compilation/patch/drivers_network.sh +++ b/lib/functions/compilation/patch/drivers_network.sh @@ -271,6 +271,10 @@ driver_rtl8811CU_rtl8821C() { # fix compilation for kernels >= 5.4 process_patch_file "${SRC}/patch/misc/wireless-rtl8811cu-Fix-VFS-import.patch" "applying" + + # fix compilation for kernels >= 6.3 + process_patch_file "${SRC}/patch/misc/wireless-rtl8811cu-6.3.patch" "applying" + fi } diff --git a/patch/misc/wireless-rtl8811cu-6.3.patch b/patch/misc/wireless-rtl8811cu-6.3.patch new file mode 100644 index 0000000000..c37a60a767 --- /dev/null +++ b/patch/misc/wireless-rtl8811cu-6.3.patch @@ -0,0 +1,38 @@ +From 90231a74d8278324d76a121169810fedfc6f5b47 Mon Sep 17 00:00:00 2001 +From: Paolo Sabatino +Date: Wed, 26 Apr 2023 21:05:40 +0000 +Subject: [PATCH] fix rtl8811cu compilation on kernel 6.3 + +--- + .../net/wireless/rtl8811cu/os_dep/linux/ioctl_cfg80211.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/drivers/net/wireless/rtl8811cu/os_dep/linux/ioctl_cfg80211.c b/drivers/net/wireless/rtl8811cu/os_dep/linux/ioctl_cfg80211.c +index d1f0909e6b18..5b4318f09d03 100644 +--- a/drivers/net/wireless/rtl8811cu/os_dep/linux/ioctl_cfg80211.c ++++ b/drivers/net/wireless/rtl8811cu/os_dep/linux/ioctl_cfg80211.c +@@ -464,7 +464,9 @@ u8 rtw_cfg80211_ch_switch_notify(_adapter *adapter, u8 ch, u8 bw, u8 offset, + * called by others with block-tx. + */ + +-#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); + #else + cfg80211_ch_switch_started_notify(adapter->pnetdev, &chdef, 0, false); +@@ -479,7 +481,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(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 +