From 9e0c0caae8ea0eb08671f6484bd48ff10f1dfff4 Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Sat, 16 Mar 2024 22:41:35 +0100 Subject: [PATCH] Fixing rtl8192eu wireless driver compatibility, removing deprecated patch --- .../compilation/patch/drivers_network.sh | 3 +- ...92eu-fix-compilation-with-6.7-kernel.patch | 54 ------------------- 2 files changed, 1 insertion(+), 56 deletions(-) delete mode 100644 patch/misc/wireless-rtl8192eu-fix-compilation-with-6.7-kernel.patch diff --git a/lib/functions/compilation/patch/drivers_network.sh b/lib/functions/compilation/patch/drivers_network.sh index e7f937bc26..65ee82ce48 100644 --- a/lib/functions/compilation/patch/drivers_network.sh +++ b/lib/functions/compilation/patch/drivers_network.sh @@ -160,7 +160,7 @@ driver_rtl8192EU() { if linux-version compare "${version}" ge 3.14; then # attach to specifics tag or branch - local rtl8192euver='commit:f2fc8af7ab58d2123eed1aa4428e713cdfc27976' # was "branch:realtek-4.4.x" + local rtl8192euver='commit:7ef82518547dcb5aacd8797e370332337b37d601' # was "branch:realtek-4.4.x" display_alert "Adding" "Wireless drivers for Realtek 8192EU chipsets ${rtl8192euver}" "info" @@ -192,7 +192,6 @@ driver_rtl8192EU() { # fix compilation for kernels >= 5.4.251 process_patch_file "${SRC}/patch/misc/wireless-rtl8192eu-Fix-building-on-5.4.251-kernel.patch" "applying" - process_patch_file "${SRC}/patch/misc/wireless-rtl8192eu-fix-compilation-with-6.7-kernel.patch" "applying" fi } diff --git a/patch/misc/wireless-rtl8192eu-fix-compilation-with-6.7-kernel.patch b/patch/misc/wireless-rtl8192eu-fix-compilation-with-6.7-kernel.patch deleted file mode 100644 index fdd652e70f..0000000000 --- a/patch/misc/wireless-rtl8192eu-fix-compilation-with-6.7-kernel.patch +++ /dev/null @@ -1,54 +0,0 @@ -From da0e6648412f099e695e644c7b6e9df90bdf356a Mon Sep 17 00:00:00 2001 -From: Gunjan Gupta -Date: Sat, 23 Dec 2023 06:56:38 +0000 -Subject: [PATCH 2/4] wireless: rtl8192eu: fix compilation with 6.7 kernel - ---- - .../rtl8192eu/os_dep/linux/ioctl_cfg80211.c | 24 +++++++++++++++++++ - 1 file changed, 24 insertions(+) - -diff --git a/drivers/net/wireless/rtl8192eu/os_dep/linux/ioctl_cfg80211.c b/drivers/net/wireless/rtl8192eu/os_dep/linux/ioctl_cfg80211.c -index c3e496aaf9c9..8ca3a79a9718 100644 ---- a/drivers/net/wireless/rtl8192eu/os_dep/linux/ioctl_cfg80211.c -+++ b/drivers/net/wireless/rtl8192eu/os_dep/linux/ioctl_cfg80211.c -@@ -5098,6 +5098,29 @@ static int cfg80211_rtw_start_ap(struct wiphy *wiphy, struct net_device *ndev, - return ret; - } - -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 7, 0)) -+static int cfg80211_rtw_change_beacon(struct wiphy *wiphy, struct net_device *ndev, -+ struct cfg80211_ap_update *info) -+{ -+ int ret = 0; -+ _adapter *adapter = (_adapter *)rtw_netdev_priv(ndev); -+ -+ RTW_INFO(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); -+ -+ ret = rtw_add_beacon(adapter, info->beacon.head, info->beacon.head_len, info->beacon.tail, info->beacon.tail_len); -+ -+ // In cases like WPS, the proberesp and assocresp IEs vary from the beacon, and need to be explicitly set -+ if (ret == 0) { -+ if (info->beacon.proberesp_ies && info->beacon.proberesp_ies_len > 0) -+ rtw_cfg80211_set_mgnt_wpsp2pie(ndev, (char *) info->beacon.proberesp_ies, info->beacon.proberesp_ies_len, 0x2 /*PROBE_RESP*/); -+ -+ if (info->beacon.assocresp_ies && info->beacon.assocresp_ies_len > 0) -+ rtw_cfg80211_set_mgnt_wpsp2pie(ndev, (char *) info->beacon.assocresp_ies, info->beacon.assocresp_ies_len, 0x4 /*ASSOC_RESP*/); -+ } -+ -+ return ret; -+} -+#else - static int cfg80211_rtw_change_beacon(struct wiphy *wiphy, struct net_device *ndev, - struct cfg80211_beacon_data *info) - { -@@ -5119,6 +5142,7 @@ static int cfg80211_rtw_change_beacon(struct wiphy *wiphy, struct net_device *nd - - return ret; - } -+#endif - - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,19, 2)) - static int cfg80211_rtw_stop_ap(struct wiphy *wiphy, struct net_device *ndev, unsigned int link_id) --- -2.34.1 -