From nobody Thu Mar 20 15:28:50 2025 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 4ZJTxv1jKKz5r0Xr; Thu, 20 Mar 2025 15:28:51 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJTxv1Dp0z3FC5; Thu, 20 Mar 2025 15:28:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742484531; 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=Kh1vU5awYZRFv8wUquAiS1H4U8o4kFwaUhLHnwnKi5g=; b=AheWl2TZlv3a1thk9Mnxl9rKACB5wjH7t7POZtIf3HLBQP9df2NUfJ6b8N8jkLWF0UAwbx PPFKT+PNQj4vtD5IvLGt/ZsIrILaCg04nU84R1Wj6E/Oo/qwRf5vmNpaUDYRH8XBLQhAvN PiczlNFRwI8dWWQ811EuJMIj/AL+xHbKJij6i9cl1QRGhNJlTq9cJqUEKpS3ZCGLH0G4bg VJLCHUkQrGJfrwU6VQSpeJeLLi3d5Tv0MH5WWFNugRRJyGDAk+APVRc76g383Ei+7pq0Pz WNQqam0TryoOiJTy/t0oa3P/CQejzbZevJfqHRt3LPjlmzltFXxdEDFOk0jACQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742484531; a=rsa-sha256; cv=none; b=aGHOUgEPrNxSFYtlFzXRv3PcZM5bcTlAxDv/CrDr6G++mQoaiRTNnBZjlwge+u7zFyMUpn +VSfK8XALsvdECJ89L0gJuPOuY4Rv9xb52HjapH2TJJ0RRrYkKj4zlBN6Ba0GdGnTGDMeq f48OkPbfSfAUT1lxmL2QbBwMpvlojZXJwFYs1Anf983ZfRXUreROUeikwa6e7xH9BHRpjE Q8s5x+RIq95SLbISqkwr5qZgH8Mypwfi10ZB2cSgdE5qwpMr8YhmrE0Ssumh5j/7+ngug/ fKihdp6fylTHpW/bVLbhMchxPF/czdtIe194/JQ+m2GPbVevISUJ7D96KHqT/A== 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=1742484531; 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=Kh1vU5awYZRFv8wUquAiS1H4U8o4kFwaUhLHnwnKi5g=; b=DgBm94rlb6p/zQ4UOwGjAMl5bL8oWE4KGfgDhq0xlKKVsTQCRcQkixGuxdTXPCgxGpvUwa 6LvOvYuAPtPp+XRs3LIRPsoGF6pNDJ3C5H8kU7pTWVLUFMtBJ1x14spFJEL8jIOsmBiFoq kUFJV+RFOVFYBF3NetBPmbsn05V31TPojz9n6Rgor83X98Ni6RDezsYVPoUnS/wTFYtkKG 79UVjmYT/tiFSqqmJME0uwxo0gFq5uisl5b7yq7x5iD3Tt5n8NHBNIN9pRu+LFj6kgVi44 lVofrPtdBmGhrBOApeVmaNJ7CZjcqkG8kniiStyNKtfbY9/1E8QLM+785gHauw== 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 4ZJTxv0ZTKz19fP; Thu, 20 Mar 2025 15:28:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52KFSomB060803; Thu, 20 Mar 2025 15:28:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52KFSoJE060800; Thu, 20 Mar 2025 15:28:50 GMT (envelope-from git) Date: Thu, 20 Mar 2025 15:28:50 GMT Message-Id: <202503201528.52KFSoJE060800@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Gallatin Subject: git: b429d50df97b - stable/14 - ifconfig: fix reporting optics on most 100g interfaces 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gallatin X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b429d50df97bc6f85373d4bd4ffca7e7078b3fe8 Auto-Submitted: auto-generated The branch stable/14 has been updated by gallatin: URL: https://cgit.FreeBSD.org/src/commit/?id=b429d50df97bc6f85373d4bd4ffca7e7078b3fe8 commit b429d50df97bc6f85373d4bd4ffca7e7078b3fe8 Author: Andrew Gallatin AuthorDate: 2025-02-25 19:17:14 +0000 Commit: Andrew Gallatin CommitDate: 2025-03-20 15:27:08 +0000 ifconfig: fix reporting optics on most 100g interfaces This fixes a bug where optics on 100G and faster NICs were not properly reported. (cherry picked from commit 709348c21351a783ff0025519d1f7cf884771077) --- lib/libifconfig/libifconfig_sfp.c | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/libifconfig/libifconfig_sfp.c b/lib/libifconfig/libifconfig_sfp.c index 17f130606765..8292135d3e47 100644 --- a/lib/libifconfig/libifconfig_sfp.c +++ b/lib/libifconfig/libifconfig_sfp.c @@ -181,6 +181,7 @@ get_qsfp_info(struct i2c_info *ii, struct ifconfig_sfp_info *sfp) if (code & SFF_8636_EXT_COMPLIANCE) { read_i2c(ii, SFF_8436_BASE, SFF_8436_OPTIONS_START, 1, &sfp->sfp_eth_ext); + sfp->sfp_eth_1040g = code; } else { /* Check 10/40G Ethernet class only */ sfp->sfp_eth_1040g =