git: 89a4cc5c8a3d - stable/13 - netmap: don't use linux type struct device *

Mark Johnston markj at FreeBSD.org
Mon Apr 19 18:17:30 UTC 2021


The branch stable/13 has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=89a4cc5c8a3d916c679436a332bc16f80b073aa6

commit 89a4cc5c8a3d916c679436a332bc16f80b073aa6
Author:     Vincenzo Maffione <vmaffione at FreeBSD.org>
AuthorDate: 2021-04-11 21:06:43 +0000
Commit:     Mark Johnston <markj at FreeBSD.org>
CommitDate: 2021-04-19 18:17:08 +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 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/dev/netmap/netmap_mem2.c b/sys/dev/netmap/netmap_mem2.c
index 7d798ee5a7fa..9f0bc2f17e53 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_assign_group(struct netmap_mem_d *, bus_dma_tag_t);
 static void nm_mem_release_id(struct netmap_mem_d *);
 
 nm_memid_t
@@ -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_assign_group(struct netmap_mem_d *nmd, bus_dma_tag_t dev)
 {
 	int err = 0, id;
 	id = nm_iommu_group_id(dev);


More information about the dev-commits-src-all mailing list