From nobody Sun Apr 30 06:58:22 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 4Q8HHL5T3Vz48sSP; Sun, 30 Apr 2023 06:58:22 +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 4Q8HHL4zxJz3PPk; Sun, 30 Apr 2023 06:58:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682837902; 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=bWgwcoW5veGMW40OYlwojRo/E5u8L31c79lZnsYAIHo=; b=wCnmQohdZPUWMn6p+5LQG4e4ruM6xvUYp9jtV/Ed/8ydEu0PCTStVLBkNOvcOu6aj0cD7I gex1LVewuL+ENc2DTu4oFCEdtcsEEZKZtkPXv31Fevhdl+ThbV/4c5PqMR+d5QTnSK6Cq3 dOX4tk6dry2sJgblCgbAmIsiP5gPecQGBET+FG0fzthCMdVbtY5QkQGdW73nYXXxiAhchX rOPAREg/v2RaqPm5dX4Mkln7Dba0AjVM8kr337/lHflPX8PzquZp23OOFdQUTSgkmC8jxq Qy07TDGjNGTebzv5uB7lfxAnmIyzjpKrWyebdrZEGaq5cLWipLQ9Z5coIAGunw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682837902; 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=bWgwcoW5veGMW40OYlwojRo/E5u8L31c79lZnsYAIHo=; b=GvI7ba7CvLkCZBoUyZt8TM1iVaF/Oa7eU9+WNI8AdEc2BUZfgHUWxYsq8NQthMMusKi2Va NlNtuPrdaPFnvAR+Lc4kPLOoB7PbPndpkk2N7Tn3A3oS1rrYHxx9ssChMPcrKFQ2ZOz2CQ cnV4g8/sy3n9XHAR1rinbR7ZQjCjfVziYhMHKw/rZCYoGHe6GXI0ua5nQQQuytCkqqNLzD BpkWo9h7mLhHc0LD1eloBx/09aF+6uEOf7XEYABApdej2N1K73eAORA7Q4DflTgmgnAE5o sOXXFnNU4k0x03sz31rq86nSB0ZGkijCCG0mrIGJCwUsb8Sf/NUvRrXOGqXoqw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682837902; a=rsa-sha256; cv=none; b=JShX5EUfAgJdONBIkr79Beftaa8cmkesTJgi48ZfzMSYxeCuNCqTxKuBF2NfiFqCy+DDX8 yDmE5OW2Di5yMBJSURdHtRJheP0ndOss6VM4Sic+aoUvRHeMnZ4zDbhcZZT545jZD/HwbL 9E+7w1AfBuptzs+vBOf3iYr29wIocd/8zPbFYtGavvgmO1yURSq+lctXtourBLEutOzy7k zJUHLuwV+L8O1jS5L8SzrvmOkSEslQeDWncqjbjeGtoW3yT99LQnSFXDe7VpqPthJ5hn8d a892EcL+PrOMNNIXps7MsJLEmWA8giJ3mRahHag3K+82O+3CvWNmttbkq7batg== 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 4Q8HHL45ZPz1Crl; Sun, 30 Apr 2023 06:58:22 +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 33U6wMhj072092; Sun, 30 Apr 2023 06:58:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33U6wMPA072091; Sun, 30 Apr 2023 06:58:22 GMT (envelope-from git) Date: Sun, 30 Apr 2023 06:58:22 GMT Message-Id: <202304300658.33U6wMPA072091@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Hans Petter Selasky Subject: git: 517ccb7c8061 - stable/13 - 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: hselasky X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 517ccb7c8061ace6565fb27f8f0de7bb9305e853 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by hselasky: URL: https://cgit.FreeBSD.org/src/commit/?id=517ccb7c8061ace6565fb27f8f0de7bb9305e853 commit 517ccb7c8061ace6565fb27f8f0de7bb9305e853 Author: Elliott Mitchell AuthorDate: 2022-06-23 00:53:47 +0000 Commit: Hans Petter Selasky CommitDate: 2023-04-30 06:56:20 +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 (cherry picked from commit 026babd427e6511e53478814ce0aa1cc3f7a9988) --- 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); }