From nobody Sat Aug 22 00:56:43 2026 X-Original-To: dev-commits-src-branches@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 4hRdzb2SQDz6ps89 for ; Sat, 22 Aug 2026 00:56:43 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hRdzb1mVxz3Pqb for ; Sat, 22 Aug 2026 00:56:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787360203; 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=bP271TV5jsWDt5eHOCuDg4CNoclhY9DAyn9zy8QpXz0=; b=ShRZBfxGCVXQ6jgaE9LTQEZjy1ObskVQfTMh8Z2ly2/610c3hi9mbTTLD4Q2kDOuYNOI1C rJ7FnVwnMdfA4kNsayyUF5+bdZqBw03Gbqkhwgag0hNUutP7jqLNO7/tSXa5igT857PjO5 ZJH3tb2epqcQ99AK7lGlSRa+ZjlchOHlLpL2wVb842QelVkPAwyYTChRloWP13IExxJhiW OzmlWvTmt/4EBl9V8CsTwDSIrPAhtpj+jW88fP6DI/Nb6stRZsDPKdRv4X6lDafjWE0+1K oCxkLqH7PCjnR1pVyNV4EWvpGYi+oqhk+COdvxAtszppRGlULLoGDZ8j/CZxhQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787360203; a=rsa-sha256; cv=none; b=dchN/tiDnEE6TZDIbnle5bjRGxEMZytb5lzNURbJr3moJ6npC017MtEbfpaCY6RA0RFSNN 3MUyszzc/ursdl2VeJcy2RqXnEoBts+XTCkYKbXB6ZfNy/RNh1A/hhBbwP3xSVDCxeTlVN acL7UUniCLv33OczA9i24onn2JdZBaTIiPRibQDEOyIyrZ8+sX6y8BegBruxbjwsH1ipuO f4OzbeBKLHAwKuUiWBgvhXPh2y2Peo21SGjcoO5xQZNmSHVuYruVwf1xibUt+O5iEv6ZSF Oq0SCDmk5QO0wHV6HngpZxq9UvJsss4PE9pGvy7LolVYesqekaLIp2jvw276cQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787360203; 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=bP271TV5jsWDt5eHOCuDg4CNoclhY9DAyn9zy8QpXz0=; b=oxGl4EJiMH7MAV1RX57onRSHVLpKQsy+BzG7+D2mPlA6mAdSwAqkojdDUUcGQilcNckhWe GXoUsNndJGITGKKjjmu79xR5psNL/lwEQ8pJRzNSu//6I2zW0rqhRfgX12s1Epajv331tM j/BzNq+gWrR4BCQHlAQyg3x226gkAjV4aQ6DVB8LiAIDcgEYbksWXbVenFy8GgN6kCcRbr 1/0HFJsObj+z46hLsGGyBxOrHBt3KJzq+qLbM0yT10gPkwfw1kl4Oa8G8uEyYA1Ahzn/He YhG82t0Siue8eM9mKif0zn+lZjbEIzOFqI8qL/C2aP9TWaYyXLyr3ZKJqz1Y8Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hRdzb0nBSzBXy for ; Sat, 22 Aug 2026 00:56:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27093 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Aug 2026 00:56:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: bf10f15ca79e - stable/14 - Revert "e1000: Correct Rx descriptor threshold programming" List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: bf10f15ca79eebfbe2a834b34cd5c54afb3ed96a Auto-Submitted: auto-generated Date: Sat, 22 Aug 2026 00:56:43 +0000 Message-Id: <6a88f3cb.27093.149d4abe@gitrepo.freebsd.org> The branch stable/14 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=bf10f15ca79eebfbe2a834b34cd5c54afb3ed96a commit bf10f15ca79eebfbe2a834b34cd5c54afb3ed96a Author: Kevin Bowling AuthorDate: 2026-08-22 00:54:57 +0000 Commit: Kevin Bowling CommitDate: 2026-08-22 00:56:02 +0000 Revert "e1000: Correct Rx descriptor threshold programming" Commit 98b95af873ac accidentally applied abe22383f1b1 a second time after its complete MFC in 081745262395. It added a duplicate em_integrated_jumbo_rx() definition and broke the build. Revert only the duplicate application. The original MFC remains in place. This reverts commit 98b95af873acf4beeb4ac9a0c83e5d009fb78cd9. --- sys/dev/e1000/if_em.c | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index 13187ea210cf..d78cd0f89ac5 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -3945,27 +3945,6 @@ em_integrated_jumbo_rx(struct e1000_hw *hw) } } -static bool -em_integrated_jumbo_rx(struct e1000_hw *hw) -{ - switch (hw->mac.type) { - case e1000_ich9lan: - case e1000_ich10lan: - case e1000_pchlan: - case e1000_pch2lan: - case e1000_pch_lpt: - case e1000_pch_spt: - case e1000_pch_cnp: - case e1000_pch_tgp: - case e1000_pch_adp: - case e1000_pch_mtp: - case e1000_pch_ptp: - return (true); - default: - return (false); - } -} - static void em_initialize_receive_unit(if_ctx_t ctx) {