From nobody Sat Feb 04 16:20:30 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 4P8HnB5mHcz3nZCs; Sat, 4 Feb 2023 16:20:30 +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 4P8HnB4YQYz44c6; Sat, 4 Feb 2023 16:20:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675527630; 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=1Ysa3E/nkIT6wNzMuAyrJMdHhYCo/GLvWxfapBGN96g=; b=UGQmCRSApRcobu53pbTQJDOAI8OUKRZehtAM3fcd27FsCS/O32X776ZzwDj2qU8aFtxJoI FKX1M9n2V1LDTtUWz6TAj0QFO7Wa8dKuoapixwSIGVZf7yKS0lrcKsDhkepnytp+oJVGg8 KwQ3ntbV0SypQ4Q2twHJFPN2xtOFUCiLdK87qsJyc0uerCPUQoJfJFY78tGERiksJMdzEH uTI8LTt77EP9kGeFmrRVk+7Cl/673rYL+ON004iQH7ciY3hUJncNDILVIvWaXZJqWvK8jf JNCU5SFF7EtMIv89hq7kqD99eLFD2IimdNagqEUoQkcyHhjew52+Cm+l0dGMDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675527630; 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=1Ysa3E/nkIT6wNzMuAyrJMdHhYCo/GLvWxfapBGN96g=; b=C9PAqKvUAPDpuQsfeG4UlNHaOMjAv+P9Zek1GkfISP2brKEkpQxHlJOh8aznkLXUMKj5E1 r9rup1/ef1nsl8nC7GdoCq9I51M9D5QnZmZJ4vB8jC9TR/00dfv+z2FbOCvJp0rltJxdM8 HY8ZBkjW9TEFtm4szRS3Pjv6PDuesKbepSelv28LDrn8qOaufclFOUGTUasrn7/d6xfxBm 6i+cX3cqD8fKBUFuG5AYruthdNOhmreHj5RAwLSaiFNztPJqrEEqrBerhkcpk9vB52nVjn apPPN3EVfCK+B0SqocEm1SW0hf8vr7eQzs1Lhf/Y4oFWeVLjiszg50PQY0LgGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675527630; a=rsa-sha256; cv=none; b=j6qslmw9OljZAeBAGtEDrNCWGzEWOWeoe/pKf05wCdwlDsOtMAv2tgoR4uhYdPPf3WViQ5 b0HZC/Owu0eUp6CO+JGr9YN25B9lm6cQoZIbX3vO9ogTSZnUp/6/N62eh3pLWRXMJVOWgt r1NOZEZElt99dN2h9gBXsY5GDdMPdgxP98k+PRcyqmfLrZZ5+i7gtIyeDSXFvj5liVKjZq Uhd6hJaoFQGPV1Bi71GGO4aPjV0NusE4UQag0wKLYmU/nCgYiHULebRo/VNHfNqm9OH7Y2 DP1TVRlnjXi84BWHoXDAaWFfqmC9Zvq+BuzjZVCeXPh5m7Hy7X/KdqownTTNww== 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 4P8HnB3S27zLFq; Sat, 4 Feb 2023 16:20:30 +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 314GKUe6013691; Sat, 4 Feb 2023 16:20:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 314GKUIO013690; Sat, 4 Feb 2023 16:20:30 GMT (envelope-from git) Date: Sat, 4 Feb 2023 16:20:30 GMT Message-Id: <202302041620.314GKUIO013690@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: 026babd427e6 - main - mlx4: 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: 026babd427e6511e53478814ce0aa1cc3f7a9988 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=026babd427e6511e53478814ce0aa1cc3f7a9988 commit 026babd427e6511e53478814ce0aa1cc3f7a9988 Author: Elliott Mitchell AuthorDate: 2022-06-23 00:53:47 +0000 Commit: Warner Losh CommitDate: 2023-02-04 16:13:09 +0000 mlx4: purge EOL release compatibility Remove FreeBSD 10 support code. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/603 Differential Revision: https://reviews.freebsd.org/D35560 --- sys/dev/mlx4/mlx4_en/mlx4_en_netdev.c | 4 ---- sys/dev/mlx4/mlx4_en/mlx4_en_port.c | 12 ------------ sys/dev/mlx4/mlx4_en/mlx4_en_tx.c | 3 +-- 3 files changed, 1 insertion(+), 18 deletions(-) diff --git a/sys/dev/mlx4/mlx4_en/mlx4_en_netdev.c b/sys/dev/mlx4/mlx4_en/mlx4_en_netdev.c index 14289cb20e13..bae22317574b 100644 --- a/sys/dev/mlx4/mlx4_en/mlx4_en_netdev.c +++ b/sys/dev/mlx4/mlx4_en/mlx4_en_netdev.c @@ -2067,7 +2067,6 @@ out: mutex_unlock(&mdev->state_lock); VLAN_CAPABILITIES(dev); break; -#if __FreeBSD_version >= 1100036 case SIOCGI2C: { struct ifi2creq i2c; @@ -2091,7 +2090,6 @@ out: error = copyout(&i2c, ifr_data_get_ptr(ifr), sizeof(i2c)); break; } -#endif case SIOCGIFRSSKEY: ifrk = (struct ifrsskey *)data; ifrk->ifrk_func = RSS_FUNC_TOEPLITZ; @@ -2263,12 +2261,10 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port, if (mdev->LSO_support) dev->if_capabilities |= IFCAP_TSO4 | IFCAP_TSO6 | IFCAP_VLAN_HWTSO; -#if __FreeBSD_version >= 1100000 /* set TSO limits so that we don't have to drop TX packets */ dev->if_hw_tsomax = MLX4_EN_TX_MAX_PAYLOAD_SIZE - (ETHER_HDR_LEN + ETHER_VLAN_ENCAP_LEN) /* hdr */; dev->if_hw_tsomaxsegcount = MLX4_EN_TX_MAX_MBUF_FRAGS - 1 /* hdr */; dev->if_hw_tsomaxsegsize = MLX4_EN_TX_MAX_MBUF_SIZE; -#endif dev->if_capenable = dev->if_capabilities; diff --git a/sys/dev/mlx4/mlx4_en/mlx4_en_port.c b/sys/dev/mlx4/mlx4_en/mlx4_en_port.c index 2e19130b9e96..89193c68a055 100644 --- a/sys/dev/mlx4/mlx4_en/mlx4_en_port.c +++ b/sys/dev/mlx4/mlx4_en/mlx4_en_port.c @@ -346,7 +346,6 @@ int mlx4_en_DUMP_ETH_STATS(struct mlx4_en_dev *mdev, u8 port, u8 reset) vport_stats->tx_frames = be64_to_cpu(tmp_vport_stats.tx_frames); } -#if __FreeBSD_version >= 1100000 if (reset == 0) { if_inc_counter(dev, IFCOUNTER_IPACKETS, priv->pkstats.rx_packets - priv->pkstats_last.rx_packets); @@ -366,17 +365,6 @@ int mlx4_en_DUMP_ETH_STATS(struct mlx4_en_dev *mdev, u8 port, u8 reset) priv->pkstats.tx_multicast_packets - priv->pkstats_last.tx_multicast_packets); } priv->pkstats_last = priv->pkstats; -#else - dev->if_ipackets = priv->pkstats.rx_packets; - dev->if_opackets = priv->pkstats.tx_packets; - dev->if_ibytes = priv->pkstats.rx_bytes; - dev->if_obytes = priv->pkstats.tx_bytes; - dev->if_ierrors = priv->pkstats.rx_errors; - dev->if_iqdrops = priv->pkstats.rx_dropped; - dev->if_imcasts = priv->pkstats.rx_multicast_packets; - dev->if_omcasts = priv->pkstats.tx_multicast_packets; - dev->if_collisions = 0; -#endif spin_unlock(&priv->stats_lock); diff --git a/sys/dev/mlx4/mlx4_en/mlx4_en_tx.c b/sys/dev/mlx4/mlx4_en/mlx4_en_tx.c index 34af99ae0340..7cff1a224e9a 100644 --- a/sys/dev/mlx4/mlx4_en/mlx4_en_tx.c +++ b/sys/dev/mlx4/mlx4_en/mlx4_en_tx.c @@ -981,10 +981,9 @@ mlx4_en_transmit(struct ifnet *dev, struct mbuf *m) /* Poll CQ here */ mlx4_en_xmit_poll(priv, i); -#if __FreeBSD_version >= 1100000 if (unlikely(err != 0)) if_inc_counter(dev, IFCOUNTER_IQDROPS, 1); -#endif + return (err); }