Merge pull request radxa-pkg#11 from 0101wu/develop

Fix the issue that the aic8800-sdio cannot be used in kernel 6.5.0 or…
themactep · May 16, 2024 · 4a1ad4a · 4a1ad4a
2 parents 9e14ba6 + 8b0d422
commit 4a1ad4a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/debian/patches/fix-linux-6.5-build.patch b/debian/patches/fix-linux-6.5-build.patch
@@ -0,0 +1,14 @@
+diff --git a/src/SDIO/driver_fw/driver/aic8800/aic8800_fdrv/rwnx_main.c b/src/SDIO/driver_fw/driver/aic8800/aic8800_fdrv/rwnx_main.c
+index dc8bc5a..0c81123 100644
+--- a/src/SDIO/driver_fw/driver/aic8800/aic8800_fdrv/rwnx_main.c
++++ b/src/SDIO/driver_fw/driver/aic8800/aic8800_fdrv/rwnx_main.c
+@@ -5512,6 +5512,9 @@ rwnx_cfg80211_tdls_mgmt(struct wiphy *wiphy,
+ 	const u8 *peer,
+ #else
+ 	u8 *peer,
++#endif
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 5, 0))
++	int link_id,
+ #endif
+ 	u8 action_code,
+ 	u8 dialog_token,
diff --git a/debian/patches/series b/debian/patches/series
@@ -7,3 +7,4 @@ fix-usb-firmware-path.patch
 fix-linux-6.1-build.patch
 fix-aic_btusb.patch
 fix-linux-6.7-build.patch
+fix-linux-6.5-build.patch