Import upstream patch to fix the build with Linux 5.19

This commit is contained in:
Sophie Brun 2022-10-06 15:59:12 +02:00
parent d1092bd331
commit 93bc402add
No known key found for this signature in database
GPG Key ID: 5792783B206FEE30
2 changed files with 50 additions and 0 deletions

49
debian/patches/Fix-for-linux-5.19.patch vendored Normal file
View File

@ -0,0 +1,49 @@
From: Sophie Brun <sophie@offensive-security.com>
Date: Thu, 6 Oct 2022 15:53:31 +0200
Subject: Fix for linux 5.19
Origin: https://github.com/aircrack-ng/rtl8188eus/pull/205
---
os_dep/linux/ioctl_cfg80211.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c
index 86c45b9..02ed8dc 100644
--- a/os_dep/linux/ioctl_cfg80211.c
+++ b/os_dep/linux/ioctl_cfg80211.c
@@ -417,7 +417,11 @@ u8 rtw_cfg80211_ch_switch_notify(_adapter *adapter, u8 ch, u8 bw, u8 offset, u8
if (ret != _SUCCESS)
goto exit;
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 0))
+ cfg80211_ch_switch_notify(adapter->pnetdev, &chdef, 0);
+#else
cfg80211_ch_switch_notify(adapter->pnetdev, &chdef);
+#endif
#else
int freq = rtw_ch2freq(ch);
@@ -4876,7 +4880,11 @@ static int cfg80211_rtw_change_beacon(struct wiphy *wiphy, struct net_device *nd
return ret;
}
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 0))
+static int cfg80211_rtw_stop_ap(struct wiphy *wiphy, struct net_device *ndev, unsigned int link_id)
+#else
static int cfg80211_rtw_stop_ap(struct wiphy *wiphy, struct net_device *ndev)
+#endif
{
_adapter *adapter = (_adapter *)rtw_netdev_priv(ndev);
@@ -9634,7 +9642,11 @@ void rtw_wdev_unregister(struct wireless_dev *wdev)
rtw_cfg80211_indicate_scan_done(adapter, _TRUE);
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)) || defined(COMPAT_KERNEL_RELEASE)
+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 0))
+ if (wdev->connected) {
+ #else
if (wdev->current_bss) {
+ #endif
RTW_INFO(FUNC_ADPT_FMT" clear current_bss by cfg80211_disconnected\n", FUNC_ADPT_ARG(adapter));
rtw_cfg80211_indicate_disconnect(adapter, 0, 1);
}

View File

@ -1,2 +1,3 @@
add-support-kernel-5.17.patch
Fix-build-for-linux-kernel-5.17.patch
Fix-for-linux-5.19.patch