From nobody Thu Jan 18 20:15:22 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 4TGDWb3Rs4z56tLh; Thu, 18 Jan 2024 20:15:23 +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 4TGDWb1ZGSz4YS2; Thu, 18 Jan 2024 20:15:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705608923; 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=fgiI66/1+rR49JLtwrD1PKhg4WLUwxdrjbRJxU3z1QQ=; b=nMQbW9WfybQJIcMZxJ/RftW4ZE7BRyN4lRB8faOyZxmr/55pyaUj5FSmlHFsLL7XcsaMSd NLJXgtKtRcgtozpLpgd7B7aWAqQAAvcQa4TH4yNzq4QwyeRG6PXSk4FR6LZ6fYtv/KgdMT WN8sja+hOc5I5tG7LiJx9Esd6Kp7HyGW26L2px9AvtSaWCmoNiddDM/fS36sEn/cLLIfqO qdG+BDJLFzEEoIFxlPQy3QODaBZE3X87QPWntvHZ6bjAtrS060OSTy3HMtC/XbYgl04xPb BPm/2lHZaJpjgPPCM0quY/75IyUnNZyf/tsuzSnBncySGvV76EmWIOoKFMJVcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705608923; 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=fgiI66/1+rR49JLtwrD1PKhg4WLUwxdrjbRJxU3z1QQ=; b=yT0wEo94X6wzV0v3czhuDfFAwVyoHhhjQ/KmaAoE2q3er9WJerXjk/EtPF9d8urx+MUDdi SRp6yBlsUi3obfYto95CKI9iX9xqfGv7vaepXQCQjBcpWWUn2QSYK6CfvceXIld+ccP3uJ R4pVyDSo0JXQFhinN8GlEpOJ5EYb7rbCZ5XySKq/ASM/0gNkIMBu/UbndBHTKvfFFd5epS TB/JNYD/d652cv8wxEsc96X6hRBF4D9blfUh5k1NwrKnv5wkE4f+6KddPJ2gnKN9epg3K5 7KvD+OgOAK5bT0Pp2RIwbVf4q7yQS1yxi0dJlNbkXMk8Z5h0zDsdA8Zh7yH0BQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705608923; a=rsa-sha256; cv=none; b=leQ6jJouWwKdzYusYy1Q+xrHfteIJ/e8p+wb/MIXmu++bFYt1OKzh+Uqa12IVI5PLImnVJ OpyPDpNMAGMKRRA7DxdQO5WbAu3kJ05ScrKqQDo+O2lI+w2yADXOEdZVRvinI58ZXQixXY iGEi1xsjNefs+CSb6Bi3zFe4dJDrA33v68AIoI9trlD4E+ZK8ad9WTRI6KZj2gtnOxYnWl wbEbmx1bLsfLZtMxdJuZgkyfC3WpkzIaE7YrInoe/LmMuA3IrBcinhZJbhjoQeaMIKItGa 6pZ/83Rl351M4OYvLpLr8d9ovZI2IJfBbAnZrgdFFvNQU/nceF4dtuIgk50W/g== 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 4TGDWb0BCMzLvL; Thu, 18 Jan 2024 20:15:23 +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 40IKFMIv068305; Thu, 18 Jan 2024 20:15:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40IKFMY1068302; Thu, 18 Jan 2024 20:15:22 GMT (envelope-from git) Date: Thu, 18 Jan 2024 20:15:22 GMT Message-Id: <202401182015.40IKFMY1068302@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: 894de2e92851 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 894de2e92851f053d2f8c7f97a778b6a95c3d5e8 Auto-Submitted: auto-generated The branch stable/13 has been updated by marius: URL: https://cgit.FreeBSD.org/src/commit/?id=894de2e92851f053d2f8c7f97a778b6a95c3d5e8 commit 894de2e92851f053d2f8c7f97a778b6a95c3d5e8 Author: Marius Strobl AuthorDate: 2024-01-09 21:41:49 +0000 Commit: Marius Strobl CommitDate: 2024-01-18 20:14:56 +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 b0870fd3f2b3..5c62eef489d2 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -544,13 +544,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, @@ -563,8 +556,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; @@ -834,8 +825,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 */