From 93bc402add81f077d5fc5425a9a92702c4e6f22a Mon Sep 17 00:00:00 2001 From: Sophie Brun Date: Thu, 6 Oct 2022 15:59:12 +0200 Subject: [PATCH] Import upstream patch to fix the build with Linux 5.19 --- debian/patches/Fix-for-linux-5.19.patch | 49 +++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 50 insertions(+) create mode 100644 debian/patches/Fix-for-linux-5.19.patch diff --git a/debian/patches/Fix-for-linux-5.19.patch b/debian/patches/Fix-for-linux-5.19.patch new file mode 100644 index 0000000..86ffbdd --- /dev/null +++ b/debian/patches/Fix-for-linux-5.19.patch @@ -0,0 +1,49 @@ +From: Sophie Brun +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); + } diff --git a/debian/patches/series b/debian/patches/series index 0d23d6a..48353e9 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ add-support-kernel-5.17.patch Fix-build-for-linux-kernel-5.17.patch +Fix-for-linux-5.19.patch