Date: Sun, 18 Feb 2024 21:11:04 GMT From: "Bjoern A. Zeeb" <bz@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 7e72ea8cd1c7 - stable/14 - ath10k/rtw89: make compile again after LinuxKPI changes Message-ID: <202402182111.41ILB4wf012898@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=7e72ea8cd1c7b9a080ce030d2827b222d165e564 commit 7e72ea8cd1c7b9a080ce030d2827b222d165e564 Author: Bjoern A. Zeeb <bz@FreeBSD.org> AuthorDate: 2024-01-08 15:29:09 +0000 Commit: Bjoern A. Zeeb <bz@FreeBSD.org> CommitDate: 2024-02-18 16:41:46 +0000 ath10k/rtw89: make compile again after LinuxKPI changes Both drivers are not yet attached to the build so this change is for people currently trying them out. In 96ab16ebab6319dce9b3041961b0ab6e20a4fecc the sys/rman.h include was removed. In various wireless drivers we prefer to directly use bus_dma functions rather than io* LinuxKPI once. In order to cast the pointer we need sys/rman.h back for our native 'struct resource' in their pci.c implementations. Long-term we should consider providing some lkpi_-FreeBSD-specific wrapper functions to avoid this problem. MFC after: 3 days (cherry picked from commit c8e7f78a3d28ff6e6223ed136ada8e1e2f34965e) --- sys/contrib/dev/athk/ath10k/pci.c | 1 + sys/contrib/dev/rtw89/pci.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/sys/contrib/dev/athk/ath10k/pci.c b/sys/contrib/dev/athk/ath10k/pci.c index 2b0b594b5466..23ff786fe45c 100644 --- a/sys/contrib/dev/athk/ath10k/pci.c +++ b/sys/contrib/dev/athk/ath10k/pci.c @@ -15,6 +15,7 @@ #include <linux/bitops.h> #if defined(__FreeBSD__) #include <linux/delay.h> +#include <sys/rman.h> #endif #include "core.h" diff --git a/sys/contrib/dev/rtw89/pci.c b/sys/contrib/dev/rtw89/pci.c index 9220f5b40d29..5639a52c2ddc 100644 --- a/sys/contrib/dev/rtw89/pci.c +++ b/sys/contrib/dev/rtw89/pci.c @@ -7,6 +7,9 @@ #endif #include <linux/pci.h> +#if defined(__FreeBSD__) +#include <sys/rman.h> +#endif #include "mac.h" #include "pci.h"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202402182111.41ILB4wf012898>