From nobody Thu Jan 18 20:15:05 2024 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 4TGDWF3RvZz56st4; Thu, 18 Jan 2024 20:15:05 +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 4TGDWF2scMz4XXp; Thu, 18 Jan 2024 20:15:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705608905; 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=QCqVwGOWkrG7hoO3GFa9aOktd+bEvv6/VL5hgoZw0js=; b=hN7kP0IdBiPjreBvb1WmnBBZVrDwDPiZ7oFZjPmAhEgV5rMx9WLy2YiIzmEnJAZFkVkwwl yGcCmha56pfhQbf5H6euMog1RiBN60B9CEiBgnQ0HEsOdCpgJ8TX1c6jPVlSqghfK+G6B5 G0kRPqfZenyIQDEE1JliYqmne9Q93IN/eXaFMdS7L+1pMT6v0txy2Hh3qx24esCMrPne9S defREzQYIV7E7SOIO8m5sO394wmMAogldRL594AGl2xBDCVYFknZoX9FPs+rN+Qtfn4cF2 c1YORGq9VeNAL2VdMxNCgvesFzZ45tKsQPnm2CyeDDhrnedg3LnG0MSsbDXoTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705608905; 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=QCqVwGOWkrG7hoO3GFa9aOktd+bEvv6/VL5hgoZw0js=; b=mhlr9X4zgQP/EQul+YNvbocLUBUuNiUteSLfE3ha8blMgHi8Hkz87O/gNLeKC8gB+WqEtF dSOFw+KGWoW/846/1pfq13NEuoMWJ2BaQWXVHNuCNu5+yqt8yq1Rk4G6QKTbjzbwhjRIWq OJGlapQ98lPI8tIlSqcvgkH1w0qX903NUvMFdlSIfRh1oyVFDWYuBzwDviSnOVfCBTSdni 3pizTP6Wbh2W7i4GvFtWBZl3X0A8CsCU13saxeTjTterdm2O+ui56AiusMaRm+ZKYMDLGK MW0oWE/Mc/mvDWrz501xDgd+PHDboaYDZOoMBZ59p9zMHjJiVn1VRoB9Y+KYKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705608905; a=rsa-sha256; cv=none; b=qGnWKaafzi+8Yc4+w1OVYN2Cj1lSdwPpDNjL4Ajukz9stcyO57kBN4CZi4XO/v7jGKZeFb cs4qVlOZIGuy7IvgO4FBwRzdJ3VAQFnTz+O05+43gzBYcHwbBFwD28SKW+ObEthCx6yvJk 9Jqgy8XmwUMytg+v4D84MJ4uIyxZahl+D2kphUYrx2lhUINgUES1F37C/1wBQMU8Aq2+zT od14PtPq39xRz71GiRZDh3woXO7ykih8yQdMSZbVjJQ0Agi2Ka/fVkPUw8CklT18JEL3Tu vZfWqmXfLSKXfHStGilHe8aMRjM0nfd7cLIZ/PFWwGFpxFcMZH1vJKhv2b6bsw== 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 4TGDWF1frmzLwl; Thu, 18 Jan 2024 20:15:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40IKF5cJ067970; Thu, 18 Jan 2024 20:15:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40IKF52r067967; Thu, 18 Jan 2024 20:15:05 GMT (envelope-from git) Date: Thu, 18 Jan 2024 20:15:05 GMT Message-Id: <202401182015.40IKF52r067967@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Marius Strobl Subject: git: 6d150c4c3f02 - stable/14 - igb(4): Remove disconnected SYSCTL 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: marius X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6d150c4c3f0258b7d0fbaf0375b328b6ae84a169 Auto-Submitted: auto-generated The branch stable/14 has been updated by marius: URL: https://cgit.FreeBSD.org/src/commit/?id=6d150c4c3f0258b7d0fbaf0375b328b6ae84a169 commit 6d150c4c3f0258b7d0fbaf0375b328b6ae84a169 Author: Marius Strobl AuthorDate: 2024-01-09 22:01:46 +0000 Commit: Marius Strobl CommitDate: 2024-01-18 20:14:46 +0000 igb(4): Remove disconnected SYSCTL The global hw.igb.rx_process_limit knob never was adhered to by the in-tree version of this driver but similar functionality is available via the device-specific dev.igb.N.iflib.rx_budget. While at it, remove the - besides initialization of tx_process_limit - unused {r,t}x_process_limit members. (cherry picked from commit f221d35be7a5749e2a1246c81adc9c03c1dc545c) --- share/man/man4/igc.4 | 6 +----- sys/dev/igc/if_igc.c | 9 --------- sys/dev/igc/if_igc.h | 2 -- 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/share/man/man4/igc.4 b/share/man/man4/igc.4 index f77581edd00b..cf36e584a679 100644 --- a/share/man/man4/igc.4 +++ b/share/man/man4/igc.4 @@ -3,7 +3,7 @@ .\" Copyright 2021 Rubicon Communications, LLC (Netgate) .\" SPDX-License-Identifier: BSD-3-Clause .\" -.Dd May 10, 2021 +.Dd January 9, 2023 .Dt IGC 4 .Os .Sh NAME @@ -118,10 +118,6 @@ maximum delay in which a transmit interrupt is generated. .It Va hw.igc.sbp Show bad packets when in promiscuous mode. Default is false. -.It Va hw.igc.rx_process_limit -Maximum number of received packets to process at a time. -Default is 100. -A value of -1 means unlimited. .It Va hw.igc.eee_setting Disable or enable Energy Efficient Ethernet. Default 1 (disabled). diff --git a/sys/dev/igc/if_igc.c b/sys/dev/igc/if_igc.c index a0f0906e30da..bfa33c82f7ba 100644 --- a/sys/dev/igc/if_igc.c +++ b/sys/dev/igc/if_igc.c @@ -254,13 +254,6 @@ static int igc_debug_sbp = true; SYSCTL_INT(_hw_igc, OID_AUTO, sbp, CTLFLAG_RDTUN, &igc_debug_sbp, 0, "Show bad packets in promiscuous mode"); -/* How many packets rxeof tries to clean at a time */ -static int igc_rx_process_limit = 100; -SYSCTL_INT(_hw_igc, OID_AUTO, rx_process_limit, CTLFLAG_RDTUN, - &igc_rx_process_limit, 0, - "Maximum number of received packets to process " - "at a time, -1 means unlimited"); - /* Energy efficient ethernet - default to OFF */ static int igc_eee_setting = 1; SYSCTL_INT(_hw_igc, OID_AUTO, eee_setting, CTLFLAG_RDTUN, &igc_eee_setting, 0, @@ -466,8 +459,6 @@ igc_if_attach_pre(if_ctx_t ctx) adapter->media = iflib_get_media(ctx); hw = &adapter->hw; - adapter->tx_process_limit = scctx->isc_ntxd[0]; - /* SYSCTL stuff */ SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), diff --git a/sys/dev/igc/if_igc.h b/sys/dev/igc/if_igc.h index 7a30f5956016..0c22ce9f76f4 100644 --- a/sys/dev/igc/if_igc.h +++ b/sys/dev/igc/if_igc.h @@ -372,8 +372,6 @@ struct igc_adapter { u32 txd_cmd; - u32 tx_process_limit; - u32 rx_process_limit; u32 rx_mbuf_sz; /* Management and WOL features */