diff options
| author | Justin Hibbits <jhibbits@FreeBSD.org> | 2021-10-20 20:49:00 +0000 |
|---|---|---|
| committer | Justin Hibbits <jhibbits@FreeBSD.org> | 2022-12-21 14:20:06 +0000 |
| commit | 402810d32e5f7525c61ef70c6af24817227e1649 (patch) | |
| tree | 00aaa1ab2daebe3d6285926cf7d01732f0877526 /sys/dev/vmware | |
| parent | 7ebc4c9bf76d1ea62e2ccd3020ff8e6e293b499c (diff) | |
Diffstat (limited to 'sys/dev/vmware')
| -rw-r--r-- | sys/dev/vmware/vmxnet3/if_vmx.c | 18 | ||||
| -rw-r--r-- | sys/dev/vmware/vmxnet3/if_vmxvar.h | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/sys/dev/vmware/vmxnet3/if_vmx.c b/sys/dev/vmware/vmxnet3/if_vmx.c index 6896bd016f00..c28368bc09dc 100644 --- a/sys/dev/vmware/vmxnet3/if_vmx.c +++ b/sys/dev/vmware/vmxnet3/if_vmx.c @@ -1196,7 +1196,7 @@ vmxnet3_reinit_rss_shared_data(struct vmxnet3_softc *sc) static void vmxnet3_reinit_shared_data(struct vmxnet3_softc *sc) { - struct ifnet *ifp; + if_t ifp; struct vmxnet3_driver_shared *ds; if_softc_ctx_t scctx; @@ -1204,16 +1204,16 @@ vmxnet3_reinit_shared_data(struct vmxnet3_softc *sc) ds = sc->vmx_ds; scctx = sc->vmx_scctx; - ds->mtu = ifp->if_mtu; + ds->mtu = if_getmtu(ifp); ds->ntxqueue = scctx->isc_ntxqsets; ds->nrxqueue = scctx->isc_nrxqsets; ds->upt_features = 0; - if (ifp->if_capenable & (IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6)) + if (if_getcapenable(ifp) & (IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6)) ds->upt_features |= UPT1_F_CSUM; - if (ifp->if_capenable & IFCAP_VLAN_HWTAGGING) + if (if_getcapenable(ifp) & IFCAP_VLAN_HWTAGGING) ds->upt_features |= UPT1_F_VLAN; - if (ifp->if_capenable & IFCAP_LRO) + if (if_getcapenable(ifp) & IFCAP_LRO) ds->upt_features |= UPT1_F_LRO; if (sc->vmx_flags & VMXNET3_FLAG_RSS) { @@ -1923,13 +1923,13 @@ vmxnet3_enable_device(struct vmxnet3_softc *sc) static void vmxnet3_reinit_rxfilters(struct vmxnet3_softc *sc) { - struct ifnet *ifp; + if_t ifp; ifp = sc->vmx_ifp; vmxnet3_set_rxfilter(sc, if_getflags(ifp)); - if (ifp->if_capenable & IFCAP_VLAN_HWFILTER) + if (if_getcapenable(ifp) & IFCAP_VLAN_HWFILTER) bcopy(sc->vmx_vlan_filter, sc->vmx_ds->vlan_filter, sizeof(sc->vmx_ds->vlan_filter)); else @@ -1946,7 +1946,7 @@ vmxnet3_init(if_ctx_t ctx) sc = iflib_get_softc(ctx); /* Use the current MAC address. */ - bcopy(IF_LLADDR(sc->vmx_ifp), sc->vmx_lladdr, ETHER_ADDR_LEN); + bcopy(if_getlladdr(sc->vmx_ifp), sc->vmx_lladdr, ETHER_ADDR_LEN); vmxnet3_set_lladdr(sc); vmxnet3_reinit_shared_data(sc); @@ -2115,7 +2115,7 @@ vmxnet3_hash_maddr(void *arg, struct sockaddr_dl *sdl, u_int count) static void vmxnet3_set_rxfilter(struct vmxnet3_softc *sc, int flags) { - struct ifnet *ifp; + if_t ifp; struct vmxnet3_driver_shared *ds; u_int mode; diff --git a/sys/dev/vmware/vmxnet3/if_vmxvar.h b/sys/dev/vmware/vmxnet3/if_vmxvar.h index 9811ae42534d..65f876cc21dc 100644 --- a/sys/dev/vmware/vmxnet3/if_vmxvar.h +++ b/sys/dev/vmware/vmxnet3/if_vmxvar.h @@ -114,7 +114,7 @@ struct vmxnet3_softc { if_ctx_t vmx_ctx; if_shared_ctx_t vmx_sctx; if_softc_ctx_t vmx_scctx; - struct ifnet *vmx_ifp; + if_t vmx_ifp; struct vmxnet3_driver_shared *vmx_ds; uint32_t vmx_flags; #define VMXNET3_FLAG_RSS 0x0002 |