From nobody Thu Jan 18 20:15:03 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 4TGDWD2QKhz56sym; Thu, 18 Jan 2024 20:15:04 +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 4TGDWD1bwWz4XS5; Thu, 18 Jan 2024 20:15:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705608904; 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=GRMU3eFserNETZtbhgUNFGAjSmMIpC2paL9TAcq/l5c=; b=eMU/mvS2m9RRNEcy3PYCiV4nWbs7yQSKe3YZ+1qYoaH3PTkFTskvU6gWDEI0KlVjJUJavH K9OTStl8ytGCuLqf79yKSMOJQF+rFzwKbazT+Xe48JxDyYGcv39LMrJmGqt5flyXulpvyB LHKD9m4XZFaaufqusjLME8+T3Ed4n/0V7d0bHJ7oweCDxj3eC7ktKhDkiLjVbOJ2XFw29n 3jeMm1t8Iy3yh8suX4C69r1i5xPl0W/E0VsTKAY3SBmwmWx3INzJD+Qa4t5ZWB1NGNyRT0 XI8Zjojdo2xF1ELsbXXvJdPmQw7IVU//tr6OVycZq/T/HLrArdJLP0eJI66G7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705608904; 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=GRMU3eFserNETZtbhgUNFGAjSmMIpC2paL9TAcq/l5c=; b=pp2FnfwqagMIPo1HM/ZxSsSbbBa/fEWTPFddMAdDnoblXTwhDz+wBUCb+eqTBcvHRgXEQZ XTXAFk8XOf4ayeTDO1SH4wWMg92lUTiG6si4gnVipeUOk2tETsKzciWu3ZVum8zJx0A0PT grObXUk3/1UJXx/7100zGXvUpwxdIZ1cqUtZbOmJ4OhoAtRX/4e51vA2Ar7nu5NSkNicTR R+2X8FUt+6wZXaNTUiUeG5tizsvu49FQ5AbLzl1d6mAHVJ2vq0kZnV68USNGB624jcjA6W TQNIRgONFM5ER9cmee9ZKPftcnS+cMzOBC7MJNe3n/vcdfE+ngZ4r5tPnGvpUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705608904; a=rsa-sha256; cv=none; b=U3jXD0ZeW4ZVvV9+c702KvVfTnSqS/Kr7aCINuepi7Hq6iLNEwCZExaPeiptoLlxS3NBz5 w/01ozR4d6M6oELcDqC+FlDI5VHIhFMbpIaV0KIMylUr2sPzjO9sVT5ZFYomzoDUzYjzx4 NeTlZy+Yn7jTl0INS9SLE3QCgNEmUNcs8Jx0lfua+rxIPFtNeO2kr5wsT0DtuleqhE+185 jIrJ++6LCqqkxybSoGUFXfLRB+m98PMEIlSdjCT74R7JXKzcocNxuZAWB6y/kinfjA4gIN +CSf6jqOHjpaqBek6Pv33BPhHwInub9qaXUSiLEyFbQuVw5BKQhdkbvv7R51wA== 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 4TGDWD0fjdzLN8; Thu, 18 Jan 2024 20:15:04 +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 40IKF3Np067928; Thu, 18 Jan 2024 20:15:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40IKF3oU067925; Thu, 18 Jan 2024 20:15:03 GMT (envelope-from git) Date: Thu, 18 Jan 2024 20:15:03 GMT Message-Id: <202401182015.40IKF3oU067925@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: c4e6ee658b94 - stable/14 - e1000(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: c4e6ee658b9444d5fc56b768a6a254c9c9b66aa6 Auto-Submitted: auto-generated The branch stable/14 has been updated by marius: URL: https://cgit.FreeBSD.org/src/commit/?id=c4e6ee658b9444d5fc56b768a6a254c9c9b66aa6 commit c4e6ee658b9444d5fc56b768a6a254c9c9b66aa6 Author: Marius Strobl AuthorDate: 2024-01-09 21:41:49 +0000 Commit: Marius Strobl CommitDate: 2024-01-18 20:14:46 +0000 e1000(4): Remove disconnected SYSCTL The global hw.em.rx_process_limit knob has been replaced by the device- specific dev.IF.N.iflib.rx_budget along with the conversion to iflib(4). While at it, remove the - besides initialization of tx_process_limit - unused {r,t}x_process_limit members. (cherry picked from commit 0d6d28ce5650d1cd23dbe4bbac87fb103b3e2d3d) --- sys/dev/e1000/if_em.c | 11 ----------- sys/dev/e1000/if_em.h | 2 -- 2 files changed, 13 deletions(-) diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index 8488f72c4cde..690d6dfa3218 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -542,13 +542,6 @@ static int em_debug_sbp = false; SYSCTL_INT(_hw_em, OID_AUTO, sbp, CTLFLAG_RDTUN, &em_debug_sbp, 0, "Show bad packets in promiscuous mode"); -/* How many packets rxeof tries to clean at a time */ -static int em_rx_process_limit = 100; -SYSCTL_INT(_hw_em, OID_AUTO, rx_process_limit, CTLFLAG_RDTUN, - &em_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 eee_setting = 1; SYSCTL_INT(_hw_em, OID_AUTO, eee_setting, CTLFLAG_RDTUN, &eee_setting, 0, @@ -561,8 +554,6 @@ static int em_max_interrupt_rate = 8000; SYSCTL_INT(_hw_em, OID_AUTO, max_interrupt_rate, CTLFLAG_RDTUN, &em_max_interrupt_rate, 0, "Maximum interrupts per second"); - - /* Global used in WOL setup with multiport cards */ static int global_quad_port_a = 0; @@ -832,8 +823,6 @@ em_if_attach_pre(if_ctx_t ctx) sc->media = iflib_get_media(ctx); hw = &sc->hw; - sc->tx_process_limit = scctx->isc_ntxd[0]; - /* Determine hardware and mac info */ em_identify_hardware(ctx); diff --git a/sys/dev/e1000/if_em.h b/sys/dev/e1000/if_em.h index ebf0be7426a0..244762e8ed0d 100644 --- a/sys/dev/e1000/if_em.h +++ b/sys/dev/e1000/if_em.h @@ -480,8 +480,6 @@ struct e1000_softc { u16 num_vlans; u32 txd_cmd; - u32 tx_process_limit; - u32 rx_process_limit; u32 rx_mbuf_sz; /* Management and WOL features */