From nobody Fri Nov 13 01:14:43 2026 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 4jQfS32shlz6y09t for ; Fri, 13 Nov 2026 01:14: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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jQfS32FbSz4mlv for ; Fri, 13 Nov 2026 01:14:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794532483; 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=8prWxz0Y7qATpFtLBwPTDGhFuZiRGpHXj6oPiGkwi3M=; b=KVpGVQTPHKsiaPDmfNd8Lu3hG1AcriEtQ8NrfJBEDc6oS8OyyNPi86f7UCSwK8fp7btsmq u7di3bd8W3ihDqo6sZhbYRYijb01cfWwRqPCCDMk0wLabQPd2dEbhUkJalX1mPOqySL7N5 tCsdvaZSwe/iUbPtCwDx/3FRRl6XqDjDc4UFSAWx1rzNpD48BJRBgZz4SmQeyifir8/b/c 7P1Qz9z07S6BxWVwFczNeOLvwr4GQ5T4pn2Nb2PpNwimtfSF1nGOoSb6eQQG0CbR7jwQT3 0MG4+2vEYSCgu7aB/qrGPnJ7lVzk12o3mIlon1Eq0VdysmcUPa+Atjeq1aIUOA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794532483; b=DYqWQ3s/CnVLoqvbe8E30Cbag7Ad7luXFBcWS3K1jN/Cqqr7cviUfceF7xJKPOXuhThUeN 2BvhRgDwhj1F0asq7CgyDLG0Z7AYvq0I+AQSciRuXKRStiaDbkvVhZ9fH3sUOUpGA8Rppy ZO7nWk9EijlmKuyU4UDcVjodWgQWO+rR691yxpqBaHBrruPn+VSpB9ER5G+FQpcJI6LAFy YSH83B+oGJPX5BYbnTqX+o0+Xn+C6HkNKCB+Illfh/gu/oUxd45Nxde1/nHorjxF0wXU6P g3Hrmf+ZQDpirsDQDSlOaWKBnab2szMK5MQEJe0I5FdxMh/7FB5G1pZhWixEUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794532483; 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=8prWxz0Y7qATpFtLBwPTDGhFuZiRGpHXj6oPiGkwi3M=; b=RQr8y6qcoTDcKcOKI1siCVl5x97Wg+YXXGMevk8dO7q/do1TqCTan1QaZUYr3Y3UDiSXwT csHCwiL3WccEs30uxWkw/z/0RP6Rf0Xwv4Q+YrXC7dzlqN/X+gRxwoXrYdrvPfDQzqgXB3 7XH6AIuPjtjEG84kLi2P/KmUUdnS36SBupdDMYDTcYnm9XlEwn0nlso3DM4vN84RWn7AFM 23dhHsiBp22ue630sJoRQzkk2T2LJZtI0D7w3YvukXkuUX101mmtH7Ode0wv7/PUkYiA0g AF3Dag3s8QuJ92i05iK9fKHMjS0VYlPomyAQuJm9oYZBK4nyLkkTs785/x/Z0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jQfS31cBKz1QTk for ; Fri, 13 Nov 2026 01:14:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19c40 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Nov 2026 01:14:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 2e4649f9503a - stable/15 - ixgbe: Restore EEE exclusion for X550EM_X KR List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository 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/15 X-Git-Reftype: branch X-Git-Commit: 2e4649f9503a82a6ed5021643a932f6a22298519 Auto-Submitted: auto-generated Date: Fri, 13 Nov 2026 01:14:43 +0000 Message-Id: <6af66483.19c40.4cdddc11@gitrepo.freebsd.org> The branch stable/15 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=2e4649f9503a82a6ed5021643a932f6a22298519 commit 2e4649f9503a82a6ed5021643a932f6a22298519 Author: Kevin Bowling AuthorDate: 2026-11-12 01:44:18 +0000 Commit: Kevin Bowling CommitDate: 2026-11-13 01:14:33 +0000 ixgbe: Restore EEE exclusion for X550EM_X KR X550EM_X KR devices do not support EEE and have no setup_eee operation. The shared-code update restored the capability removed by d61b6a41dd30, and the E610 EEE support subsequently added an unchecked call during attach. Together these changes allow a NULL function pointer call when attaching a KR device. Remove the incorrect EEE capability and use the NULL-safe ixgbe_setup_eee() wrapper when enabling EEE at attach. Removing the unsupported capability also stops exposing eee_state and the eee.tx_lpi_count and eee.rx_lpi_count sysctls on X550EM_X_KR devices. Fixes: f72de14ea132 ("ixgbe: update if_ix and ixgbe api with ix-3.3.38 changes") Fixes: 13ee84c591f8 ("ix(4): Add EEE support for E610 adapters") Sponsored by: BBOX.io (cherry picked from commit 4678f9d8dc1324da6c021dc9d376a4671e72ad97) --- sys/dev/ixgbe/if_ix.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/dev/ixgbe/if_ix.c b/sys/dev/ixgbe/if_ix.c index 72f5d5e181d0..2239f8296788 100644 --- a/sys/dev/ixgbe/if_ix.c +++ b/sys/dev/ixgbe/if_ix.c @@ -1241,7 +1241,7 @@ ixgbe_if_attach_pre(if_ctx_t ctx) /* Enable EEE power saving */ if (sc->feat_en & IXGBE_FEATURE_EEE) - hw->mac.ops.setup_eee(hw, true); + ixgbe_setup_eee(hw, true); /* Set an initial default flow control value */ hw->fc.requested_mode = ixgbe_flow_control; @@ -6404,8 +6404,6 @@ ixgbe_init_device_features(struct ixgbe_softc *sc) sc->feat_cap |= IXGBE_FEATURE_RECOVERY_MODE; sc->feat_cap |= IXGBE_FEATURE_SRIOV; sc->feat_cap |= IXGBE_FEATURE_FDIR; - if (sc->hw.device_id == IXGBE_DEV_ID_X550EM_X_KR) - sc->feat_cap |= IXGBE_FEATURE_EEE; break; case ixgbe_mac_X550EM_a: sc->feat_cap |= IXGBE_FEATURE_RECOVERY_MODE;