From nobody Sat Feb 4 16:20:13 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P8Hmt014gz3nYw5; Sat, 4 Feb 2023 16:20:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P8Hms6RfGz43lP; Sat, 4 Feb 2023 16:20:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675527613; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TlQtFesXQqL/L9X/uSpxPl53qXBCLNLfUzLKYjwq5Xg=; b=esYkrEo3uT6mDrjN+WosymPOfHIHVNlfG7RZqrrc8pS316yBiw5Cb8anUMy7vtZI14zepe aGZHdrUecBfttvuYSkS67HzBsZlYm0eU5q7+HF6L63dpSCYaDwGYRCz5q/LqwsQs25rrHk 7x6eYPWwzgkSpUez6YPtRkw0TGCwSLl3cwshB74PSAM55/gq/63cVN+jvdF5DlLbRrcuvT b9nQ8aiYlkgBfB2XjIE9NbkwLE6eZ1kbbFbb5Z9xPqjgYy7O+yW2UMrttuyVNvVej4rEes 3XDlMnlB/ViTbIj/oKBbs2zN4FBlWerASE0AGn7DGV2E6Eq5FqKYHrJ+QxGfhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675527613; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TlQtFesXQqL/L9X/uSpxPl53qXBCLNLfUzLKYjwq5Xg=; b=SEZ1wHKa6IJNa65/LVsCPq1Ho6/7cNi3oKFiOMI2n76A+8aVTPsv7U7MBcDNt2HkUSiC4p NV3Ub3eJhDSv4LGOaSnVuBcCOJM5z5Pmqj9F480z3UhGJ1/ByCG/F4UO0Zyrjq8oanJPfn g3VmLVPLpCxsX5VWEwEuZpPnTOM+Hk56MzCPWnjZZbYQM6GuIUfP7qMkduxrUvMEaosIOc P90+NGEi3ZVhVSQBCZp4yiIv/x6Ep3wF02q35CIaKz+UvQjDKXZyAX+bFkLlf3TBCGDGqe E7ylMqyTPYMBGW7bIlJDQ6WzTrquTzIiYa6tei4aIv2YkWnxrvnNtNCXywd3tQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675527613; a=rsa-sha256; cv=none; b=cnE6qr6LxjDEXVJL9JuHzVxrW1LsQ//zZ47fwG9r5THeDVdXYxJuSKqBYeXfVn/ZF9pC1/ jCKd1GbdZem3nJP2u/P4ngxSiZL2JLGOyBhmRVbFqnNvL916SMTBPYA6t372dAk++S3zwD NxqafIVz06scLJ66RDiqRp76FC3rMd+EISwd7fV4Ar9W95taLA4sdRxIUs/aacKqNhBOSD Ij4STTZ0mqa6O4QSqr5buSpGZkECGdQyXQprZ5MI9bQi8Jh9hh627+wvCWOWJPkUiR86U0 c+LwyAqNGyymxx32jY0FzgQ1UvF4bOelcJSlCwQUqHiKF/PAm8VAEGck0zRjJw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P8Hms5YybzLJt; Sat, 4 Feb 2023 16:20:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 314GKDth011232; Sat, 4 Feb 2023 16:20:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 314GKDto011226; Sat, 4 Feb 2023 16:20:13 GMT (envelope-from git) Date: Sat, 4 Feb 2023 16:20:13 GMT Message-Id: <202302041620.314GKDto011226@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: c98b837ad01d - main - mxge: purge EOL release compatibility List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c98b837ad01d3a43935f826ef0a298ea618885b0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=c98b837ad01d3a43935f826ef0a298ea618885b0 commit c98b837ad01d3a43935f826ef0a298ea618885b0 Author: Elliott Mitchell AuthorDate: 2022-06-23 00:53:47 +0000 Commit: Warner Losh 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)