JDM170/build
1
0
Fork 0
mirror of https://github.com/armbian/build synced 2025-09-24 19:47:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

xradio: remove upstreamed patch

Browse Source
This commit is contained in:
Gunjan Gupta
2023-12-25 11:20:19 +05:30
parent 4ab3a94630
commit 2ea9d98656
2 changed files with 1 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/functions/compilation/patch/drivers_network.sh
View File

@@ -252,7 +252,7 @@ driver_xradio_xr819() {
if linux-version compare "${version}" ge 4.19 && [[ "$LINUXFAMILY" == sunxi* ]]; then if linux-version compare "${version}" ge 4.19 && [[ "$LINUXFAMILY" == sunxi* ]]; then
display_alert "Adding" "Wireless drivers for Xradio XR819 chipsets" "info" display_alert "Adding" "Wireless drivers for Xradio XR819 chipsets" "info"
local xradio_xr819_ver="commit:547521df27d1a80fb5542e93fa13bd09fb2259a2" local xradio_xr819_ver="commit:3a1f77fb2db248b7d18d93b67b16e0d6c91db184"
fetch_from_repo "$GITHUB_SOURCE/fifteenhex/xradio" "xradio" "${xradio_xr819_ver}" "yes" fetch_from_repo "$GITHUB_SOURCE/fifteenhex/xradio" "xradio" "${xradio_xr819_ver}" "yes"
cd "$kerneldir" || exit cd "$kerneldir" || exit
@@ -275,8 +275,6 @@ driver_xradio_xr819() {
>> "$kerneldir/drivers/net/wireless/Makefile" >> "$kerneldir/drivers/net/wireless/Makefile"
sed -i '/source "drivers\/net\/wireless\/ti\/Kconfig"/a source "drivers\/net\/wireless\/xradio\/Kconfig"' \ sed -i '/source "drivers\/net\/wireless\/ti\/Kconfig"/a source "drivers\/net\/wireless\/xradio\/Kconfig"' \
"$kerneldir/drivers/net/wireless/Kconfig" "$kerneldir/drivers/net/wireless/Kconfig"
process_patch_file "${SRC}/patch/misc/wireless-xradio-Fix-compilation-with-6.7-kernel.patch" "applying"
fi fi
} }

25
patch/misc/wireless-xradio-Fix-compilation-with-6.7-kernel.patch
View File

@@ -1,25 +0,0 @@
From 4c2433e077e67560d8af5bd4495e925fd8e8458c Mon Sep 17 00:00:00 2001
From: Gunjan Gupta <viraniac@gmail.com>
Date: Sat, 23 Dec 2023 00:38:42 +0530
Subject: [PATCH] Fix compilation failure on 6.7 kernel
---
drivers/net/wireless/xradio/tx.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/net/wireless/xradio/tx.c b/drivers/net/wireless/xradio/tx.c
index 481de2d..fd31541 100644
--- a/drivers/net/wireless/xradio/tx.c
+++ b/drivers/net/wireless/xradio/tx.c
@@ -1268,7 +1268,11 @@ void xradio_skb_dtor(struct xradio_common *hw_priv,
txpriv->raw_link_id, txpriv->tid);
tx_policy_put(hw_priv, txpriv->rate_id);
}
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 7, 0))
+ ieee80211_tx_status_skb(hw_priv->hw, skb);
+#else
ieee80211_tx_status(hw_priv->hw, skb);
+#endif
}
#if defined(CONFIG_XRADIO_USE_EXTENSIONS)