From nobody Sat Feb 04 16:20:21 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 4P8Hn15SK6z3nYwY; Sat, 4 Feb 2023 16:20:21 +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 4P8Hn14R5Hz44CP; Sat, 4 Feb 2023 16:20:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675527621; 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=UTrUW18DitgOchhfhL39lbfJ7HQvXlQpQuZh3VGwFSI=; b=ktDq+pB8pF+yByDJHdnV2j3feFvJaFwvhFV7JObc3/IYhlfdhf0y3gJSXMMWdiAVaFIu2C eOAhfZrvPsyx+Ck2vtWuCJKyWUiVDT5UiNkSSIRnchtSRnC3jccDQU7gP7GppSunfrcDbw weSqTlamgY1erOflMyYMj7NBwLVkRRqVJGBef13u4dFnToet2msNstyXQKL0RPaJmYUL9J 5mq80QqReQMUxOWnG4NHjWQrTi81bD7ljyugGCbgsCoThKzCfokQcBjFv5X/Q/ToEF5Ww+ EZGrzZ/LQdk0Y6aI3qRxPyk44mFrHsKcwRbKGgOWns0ceWVsbZidrlqjd2AjYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675527621; 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=UTrUW18DitgOchhfhL39lbfJ7HQvXlQpQuZh3VGwFSI=; b=NMWobjZERCK2vqpBbPqWvmiL3ZpztHVci5TRBzovcTES60BBvOE9J/aKggs/cKDtK1oh4a Z5nWKlTyplcTTextizsoOHtvNjg0xVCu0VqxojnjZoUS0nY6g0Wlo/tYYjGCarw9Z9mTSN +ZwrBtzbR85K8EwCxGn/cdP/BbhD3awWKueOWDUzCdNNdYcD1tzz3XvXbxUTr50mm/2W36 anM+FBJJlYczIW2yJlaFuV7SRzlKKX3LRuR0/S7QS0xb7a+SznTzSTBUysjJGfLJERVsN3 J0YE9Sj+a3bgOeKNMOHkdPOBUzmCZS6Fxv6dneuhTz2VDWP4tsU85Em34zPAqw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675527621; a=rsa-sha256; cv=none; b=KJVX/UQd+mdYFykYqNEYuhheuB2depTdpCxrgsaRon9QruCwahiohgfNxXg3G5mqeIVX+e +Z9ePgnpnPxlVKQ3YeQXDt7gkTH+GNS5zCqDkhhN7I5gGxsVP1xNiCa+5EulLf87ron4vJ yHBO/a8RmloduESDnYXkXqceUiF1iDjupsqy8IPGbTlI5BIfH3nk0YFKd/FrpEWdhUAff2 8WFmYe4L0shakH+i+m+G9nfFMsd/3T/QMfpzhb1qc7PCLHMCzECZSTkPyKLjSIRNXJrKUG MiCy3KYUlCZ53I0SVhEXvAhg+HL4k5DWooafLrR6PBv5wNItaAgAszRIdaOa0Q== 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 4P8Hn13XMVzLDX; Sat, 4 Feb 2023 16:20:21 +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 314GKLBP013487; Sat, 4 Feb 2023 16:20:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 314GKLNQ013486; Sat, 4 Feb 2023 16:20:21 GMT (envelope-from git) Date: Sat, 4 Feb 2023 16:20:21 GMT Message-Id: <202302041620.314GKLNQ013486@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: bd78d17c333c - main - qlxgbe: 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: bd78d17c333ca44c1a0ed714cd1a4ca140ef3759 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=bd78d17c333ca44c1a0ed714cd1a4ca140ef3759 commit bd78d17c333ca44c1a0ed714cd1a4ca140ef3759 Author: Elliott Mitchell AuthorDate: 2022-06-23 00:53:47 +0000 Commit: Warner Losh CommitDate: 2023-02-04 16:13:08 +0000 qlxgbe: purge EOL release compatibility Drop code that differentiated between FreeBSD 10 and 11. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/603 Differential Revision: https://reviews.freebsd.org/D35560 --- sys/dev/qlxgbe/ql_hw.c | 19 ------------------- sys/dev/qlxgbe/ql_isr.c | 37 ++----------------------------------- sys/dev/qlxgbe/ql_os.c | 4 ---- sys/dev/qlxgbe/ql_os.h | 4 ---- 4 files changed, 2 insertions(+), 62 deletions(-) diff --git a/sys/dev/qlxgbe/ql_hw.c b/sys/dev/qlxgbe/ql_hw.c index 340fc779b10c..119f22ad4137 100644 --- a/sys/dev/qlxgbe/ql_hw.c +++ b/sys/dev/qlxgbe/ql_hw.c @@ -2761,21 +2761,12 @@ qla_config_soft_lro(qla_host_t *ha) bzero(lro, sizeof(struct lro_ctrl)); -#if (__FreeBSD_version >= 1100101) if (tcp_lro_init_args(lro, ha->ifp, 0, NUM_RX_DESCRIPTORS)) { device_printf(ha->pci_dev, "%s: tcp_lro_init_args [%d] failed\n", __func__, i); return (-1); } -#else - if (tcp_lro_init(lro)) { - device_printf(ha->pci_dev, - "%s: tcp_lro_init [%d] failed\n", - __func__, i); - return (-1); - } -#endif /* #if (__FreeBSD_version >= 1100101) */ lro->ifp = ha->ifp; } @@ -2796,17 +2787,7 @@ qla_drain_soft_lro(qla_host_t *ha) for (i = 0; i < hw->num_sds_rings; i++) { lro = &hw->sds[i].lro; -#if (__FreeBSD_version >= 1100101) tcp_lro_flush_all(lro); -#else - struct lro_entry *queued; - - while ((!SLIST_EMPTY(&lro->lro_active))) { - queued = SLIST_FIRST(&lro->lro_active); - SLIST_REMOVE_HEAD(&lro->lro_active, next); - tcp_lro_flush(lro, queued); - } -#endif /* #if (__FreeBSD_version >= 1100101) */ } #endif diff --git a/sys/dev/qlxgbe/ql_isr.c b/sys/dev/qlxgbe/ql_isr.c index 0d1ae164c7ae..0ccc1cbb84c9 100644 --- a/sys/dev/qlxgbe/ql_isr.c +++ b/sys/dev/qlxgbe/ql_isr.c @@ -165,33 +165,14 @@ qla_rx_intr(qla_host_t *ha, qla_sgl_rcv_t *sgc, uint32_t sds_idx) mpf->m_pkthdr.flowid = sgc->rss_hash; -#if __FreeBSD_version >= 1100000 M_HASHTYPE_SET(mpf, M_HASHTYPE_OPAQUE_HASH); -#else -#if (__FreeBSD_version >= 903511 && __FreeBSD_version < 1100000) - M_HASHTYPE_SET(mpf, M_HASHTYPE_OPAQUE); -#else - M_HASHTYPE_SET(mpf, M_HASHTYPE_NONE); -#endif -#endif /* #if __FreeBSD_version >= 1100000 */ #if defined(INET) || defined(INET6) - if (ha->hw.enable_soft_lro) { -#if (__FreeBSD_version >= 1100101) - + if (ha->hw.enable_soft_lro) tcp_lro_queue_mbuf(lro, mpf); - -#else - if (tcp_lro_rx(lro, mpf, 0)) - (*ifp->if_input)(ifp, mpf); - -#endif /* #if (__FreeBSD_version >= 1100101) */ - - } else + else #endif - { (*ifp->if_input)(ifp, mpf); - } if (sdsp->rx_free > ha->std_replenish) qla_replenish_normal_rx(ha, sdsp, r_idx); @@ -735,21 +716,7 @@ ql_rcv_isr(qla_host_t *ha, uint32_t sds_idx, uint32_t count) struct lro_ctrl *lro; lro = &ha->hw.sds[sds_idx].lro; - -#if (__FreeBSD_version >= 1100101) - tcp_lro_flush_all(lro); - -#else - struct lro_entry *queued; - - while ((!SLIST_EMPTY(&lro->lro_active))) { - queued = SLIST_FIRST(&lro->lro_active); - SLIST_REMOVE_HEAD(&lro->lro_active, next); - tcp_lro_flush(lro, queued); - } - -#endif /* #if (__FreeBSD_version >= 1100101) */ } #endif diff --git a/sys/dev/qlxgbe/ql_os.c b/sys/dev/qlxgbe/ql_os.c index f0cee6e080b1..298de1693b66 100644 --- a/sys/dev/qlxgbe/ql_os.c +++ b/sys/dev/qlxgbe/ql_os.c @@ -1583,11 +1583,7 @@ qla_transmit(struct ifnet *ifp, struct mbuf *mp) QL_DPRINT2(ha, (ha->pci_dev, "%s: enter\n", __func__)); -#if __FreeBSD_version >= 1100000 if (M_HASHTYPE_GET(mp) != M_HASHTYPE_NONE) -#else - if (mp->m_flags & M_FLOWID) -#endif rss_id = (mp->m_pkthdr.flowid & Q8_RSS_IND_TBL_MAX_IDX) % ha->hw.num_sds_rings; fp = &ha->tx_fp[rss_id]; diff --git a/sys/dev/qlxgbe/ql_os.h b/sys/dev/qlxgbe/ql_os.h index fcee6e740828..678eff63520e 100644 --- a/sys/dev/qlxgbe/ql_os.h +++ b/sys/dev/qlxgbe/ql_os.h @@ -52,10 +52,6 @@ #include #include -#if __FreeBSD_version < 900044 -#error FreeBSD Version not supported - use version >= 900044 -#endif - #include #include #include