The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=c98b837ad01d3a43935f826ef0a298ea618885b0
commit c98b837ad01d3a43935f826ef0a298ea618885b0 Author: Elliott Mitchell <[email protected]> AuthorDate: 2022-06-23 00:53:47 +0000 Commit: Warner Losh <[email protected]> CommitDate: 2023-02-04 16:10:57 +0000 mxge: purge EOL release compatibility Remove FreeBSD 7, 8, 9 and 10 compatibility code. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/603 Differential Revision: https://reviews.freebsd.org/D35560 --- sys/dev/mxge/if_mxge.c | 10 ++-------- sys/dev/mxge/if_mxge_var.h | 16 ---------------- 2 files changed, 2 insertions(+), 24 deletions(-) diff --git a/sys/dev/mxge/if_mxge.c b/sys/dev/mxge/if_mxge.c index 8b2118eeb9de..f8b3a6e25c52 100644 --- a/sys/dev/mxge/if_mxge.c +++ b/sys/dev/mxge/if_mxge.c @@ -4582,10 +4582,7 @@ mxge_add_msix_irqs(mxge_softc_t *sc) for (i = 0; i < sc->num_slices; i++) { err = bus_setup_intr(sc->dev, sc->msix_irq_res[i], - INTR_TYPE_NET | INTR_MPSAFE, -#if __FreeBSD_version > 700030 - NULL, -#endif + INTR_TYPE_NET | INTR_MPSAFE, NULL, mxge_intr, &sc->ss[i], &sc->msix_ih[i]); if (err != 0) { device_printf(sc->dev, "couldn't setup intr for " @@ -4658,10 +4655,7 @@ mxge_add_single_irq(mxge_softc_t *sc) sc->legacy_irq ? "INTx" : "MSI", rman_get_start(sc->irq_res)); err = bus_setup_intr(sc->dev, sc->irq_res, - INTR_TYPE_NET | INTR_MPSAFE, -#if __FreeBSD_version > 700030 - NULL, -#endif + INTR_TYPE_NET | INTR_MPSAFE, NULL, mxge_intr, &sc->ss[0], &sc->ih); if (err != 0) { bus_release_resource(sc->dev, SYS_RES_IRQ, diff --git a/sys/dev/mxge/if_mxge_var.h b/sys/dev/mxge/if_mxge_var.h index c166011d434f..326359c68005 100644 --- a/sys/dev/mxge/if_mxge_var.h +++ b/sys/dev/mxge/if_mxge_var.h @@ -40,25 +40,9 @@ $FreeBSD$ #define MXGE_EEPROM_STRINGS_SIZE 256 #define MXGE_MAX_SEND_DESC 128 -#if ((__FreeBSD_version > 800000 && __FreeBSD_version < 800005) \ - || __FreeBSD_version < 700111) -#define MXGE_VIRT_JUMBOS 1 -#else #define MXGE_VIRT_JUMBOS 0 -#endif -#if (__FreeBSD_version > 800082) #define IFNET_BUF_RING 1 -#endif - -#if (__FreeBSD_version < 1000020) -#undef IF_Kbps -#undef IF_Mbps -#undef IF_Gbps -#define IF_Kbps(x) ((uintmax_t)(x) * 1000) /* kilobits/sec. */ -#define IF_Mbps(x) (IF_Kbps((x) * 1000)) /* megabits/sec. */ -#define IF_Gbps(x) (IF_Mbps((x) * 1000)) /* gigabits/sec. */ -#endif #ifndef VLAN_CAPABILITIES #define VLAN_CAPABILITIES(ifp)
