diff options
| author | Justin Hibbits <jhibbits@FreeBSD.org> | 2023-01-12 18:38:37 +0000 |
|---|---|---|
| committer | Justin Hibbits <jhibbits@FreeBSD.org> | 2023-02-14 15:21:19 +0000 |
| commit | e330262f34fc179ce920c16bb28ba8a1c4a73aff (patch) | |
| tree | a69292f7d6c730557ee6ba2ee8c427594587e789 /sys/dev/netmap/netmap_mem2.c | |
| parent | 4366ea339ddb0945d94a646fc991ff293c6ec526 (diff) | |
Diffstat (limited to 'sys/dev/netmap/netmap_mem2.c')
| -rw-r--r-- | sys/dev/netmap/netmap_mem2.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/dev/netmap/netmap_mem2.c b/sys/dev/netmap/netmap_mem2.c index 8575a940961e..7f498a710325 100644 --- a/sys/dev/netmap/netmap_mem2.c +++ b/sys/dev/netmap/netmap_mem2.c @@ -2476,7 +2476,7 @@ out: #ifdef WITH_PTNETMAP struct mem_pt_if { struct mem_pt_if *next; - struct ifnet *ifp; + if_t ifp; unsigned int nifp_offset; }; @@ -2494,7 +2494,7 @@ struct netmap_mem_ptg { /* Link a passthrough interface to a passthrough netmap allocator. */ static int -netmap_mem_pt_guest_ifp_add(struct netmap_mem_d *nmd, struct ifnet *ifp, +netmap_mem_pt_guest_ifp_add(struct netmap_mem_d *nmd, if_t ifp, unsigned int nifp_offset) { struct netmap_mem_ptg *ptnmd = (struct netmap_mem_ptg *)nmd; @@ -2517,14 +2517,14 @@ netmap_mem_pt_guest_ifp_add(struct netmap_mem_d *nmd, struct ifnet *ifp, NMA_UNLOCK(nmd); nm_prinf("ifp=%s,nifp_offset=%u", - ptif->ifp->if_xname, ptif->nifp_offset); + if_name(ptif->ifp), ptif->nifp_offset); return 0; } /* Called with NMA_LOCK(nmd) held. */ static struct mem_pt_if * -netmap_mem_pt_guest_ifp_lookup(struct netmap_mem_d *nmd, struct ifnet *ifp) +netmap_mem_pt_guest_ifp_lookup(struct netmap_mem_d *nmd, if_t ifp) { struct netmap_mem_ptg *ptnmd = (struct netmap_mem_ptg *)nmd; struct mem_pt_if *curr; @@ -2540,7 +2540,7 @@ netmap_mem_pt_guest_ifp_lookup(struct netmap_mem_d *nmd, struct ifnet *ifp) /* Unlink a passthrough interface from a passthrough netmap allocator. */ int -netmap_mem_pt_guest_ifp_del(struct netmap_mem_d *nmd, struct ifnet *ifp) +netmap_mem_pt_guest_ifp_del(struct netmap_mem_d *nmd, if_t ifp) { struct netmap_mem_ptg *ptnmd = (struct netmap_mem_ptg *)nmd; struct mem_pt_if *prev = NULL; @@ -2557,7 +2557,7 @@ netmap_mem_pt_guest_ifp_del(struct netmap_mem_d *nmd, struct ifnet *ifp) ptnmd->pt_ifs = curr->next; } nm_prinf("removed (ifp=%s,nifp_offset=%u)", - curr->ifp->if_xname, curr->nifp_offset); + if_name(curr->ifp), curr->nifp_offset); nm_os_free(curr); ret = 0; break; @@ -2949,7 +2949,7 @@ netmap_mem_pt_guest_attach(struct ptnetmap_memdev *ptn_dev, nm_memid_t mem_id) /* Called when ptnet device is attaching */ struct netmap_mem_d * -netmap_mem_pt_guest_new(struct ifnet *ifp, +netmap_mem_pt_guest_new(if_t ifp, unsigned int nifp_offset, unsigned int memid) { |