git: e93766bcd4e1 - stable/12 - netmap: don't use linux type struct device *
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 31 Dec 2022 12:39:32 UTC
The branch stable/12 has been updated by vmaffione:
URL: https://cgit.FreeBSD.org/src/commit/?id=e93766bcd4e18217b9594e827c28c6291d06c6e6
commit e93766bcd4e18217b9594e827c28c6291d06c6e6
Author: Vincenzo Maffione <vmaffione@FreeBSD.org>
AuthorDate: 2021-04-11 21:06:43 +0000
Commit: Vincenzo Maffione <vmaffione@FreeBSD.org>
CommitDate: 2022-12-31 12:38:43 +0000
netmap: don't use linux type struct device *
Such type cannot be used in code that is in common between
FreeBSD and Linux. Use the FreeBSD type instead.
MFC after: 3 days
Reported by: markj
Differential Revision: https://reviews.freebsd.org/D29677
(cherry picked from commit 70275a6735df8a514f48be77418491f2f8dba817)
---
sys/dev/netmap/netmap_mem2.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sys/dev/netmap/netmap_mem2.c b/sys/dev/netmap/netmap_mem2.c
index 7d798ee5a7fa..32dd9550418c 100644
--- a/sys/dev/netmap/netmap_mem2.c
+++ b/sys/dev/netmap/netmap_mem2.c
@@ -308,7 +308,7 @@ netmap_mem_rings_delete(struct netmap_adapter *na)
static int netmap_mem_map(struct netmap_obj_pool *, struct netmap_adapter *);
static int netmap_mem_unmap(struct netmap_obj_pool *, struct netmap_adapter *);
-static int nm_mem_assign_group(struct netmap_mem_d *, struct device *);
+static int nm_mem_check_group(struct netmap_mem_d *, bus_dma_tag_t);
static void nm_mem_release_id(struct netmap_mem_d *);
nm_memid_t
@@ -356,7 +356,7 @@ int
netmap_mem_finalize(struct netmap_mem_d *nmd, struct netmap_adapter *na)
{
int lasterr = 0;
- if (nm_mem_assign_group(nmd, na->pdev) < 0) {
+ if (nm_mem_check_group(nmd, na->pdev) < 0) {
return ENOMEM;
}
@@ -725,7 +725,7 @@ netmap_mem_find(nm_memid_t id)
}
static int
-nm_mem_assign_group(struct netmap_mem_d *nmd, struct device *dev)
+nm_mem_check_group(struct netmap_mem_d *nmd, bus_dma_tag_t dev)
{
int err = 0, id;
id = nm_iommu_group_id(dev);