From 0d6d28ce5650d1cd23dbe4bbac87fb103b3e2d3d Mon Sep 17 00:00:00 2001 From: Marius Strobl Date: Tue, 9 Jan 2024 22:41:49 +0100 Subject: [PATCH] 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. --- 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 */