From nobody Tue Feb 11 00:50:21 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 4YsNCL0FCtz5n6Fh; Tue, 11 Feb 2025 00:50:22 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YsNCK6gVYz3kBf; Tue, 11 Feb 2025 00:50:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739235022; 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=B6ezo4CFW8QymuLG0PhQzxnWG6ejS8IN8AM8z/3wDn4=; b=TBl84I7wEjr36A2G8GROT2c0rS3a582+9tUNgH/5cd8Hw1wasTwZzSeWleRBSMouhqbMLN k6mUtf01/eCwQ1tSEzf1bIhB7BOIB1ihnqegHHzN5O4gwt/+wqLt2GhuX3OZtDAmLxFHyl IHSvrdcGswUVK+CbOZJ4QkYBnu6ZubN8AOjyJvp4U17xdXFcho7ASJRELOCvEkWx72c+h1 Ikqbe+pcG9tAj9Ir2jqtwJhvz5NL+G6iTLhvUpj5baGBOdXtMK0gFTQhbWCUSXCRoADsYx QgU7uUyj5nMROQy+cLKB0i/laCle1scg+14bRSsciqaVRVS5dP25oPT0Yx58Yg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739235022; 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=B6ezo4CFW8QymuLG0PhQzxnWG6ejS8IN8AM8z/3wDn4=; b=qGSeKSaasamwnFB4Zaz5wE7WMQ1MbwKyJrLeH/zRB70KPv9OlaT2amrMEdr+b1CC8fbPv5 fkov+1/C2DbF3cNQQEYS17ZLbomtlxXk4zCeJ7VduC7e5lImQDI9hGgw1oChlNHBbhT0qo sgr0UB2SFVsR/KEYOhsq6rHh7096mja1dHV00d3gce6YBEUQkfcXlDVuxICWJSZfcaMuTA /JSl/cKum7mRsUkr/W3mGB2SKYH12T813UckJtWeOUxYNctHoRssneJaX9vZvabA/5Vy5h imKr4SrBVp/o1k0kUs3wCs3lcOobE6KDhBKxQxsdQUkZbpEPyF5Biw9y+3zLWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739235022; a=rsa-sha256; cv=none; b=pdC/bbbFJKXAfxfv8aoWjFXotoU6OjzY/EjYZsmpARCi5pktYJd4iwC2rZ1ZANY0VA6zHn NHA3PDv+wG+VaUVG6eGCzFOBgANWlu7VNBQD2YjW7QVn/XD/FupYCNYMzFNQ99lreIwMoF FNpMbwoyV8XU4RH4Uew5hwOWTd4MX0uK1ymGHFbKGjAOhqMVGTtHzfoLwlEmEoOrUm12bU b/Ac77Dsohdyuqz8sBTPV9n+22OHEMv/WSK5YQrdE9kiSVNDs8pC7YaFpSh5fR3wkSGgv0 R7n8La7Rkc60fiyWeUT2hA+ZJRNSfmLdz5Bn+jAXgnNcVMSsfR5AUOq8s8kE5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YsNCK67jnzqq3; Tue, 11 Feb 2025 00:50:21 +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 51B0oLYV046866; Tue, 11 Feb 2025 00:50:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51B0oLGn046863; Tue, 11 Feb 2025 00:50:21 GMT (envelope-from git) Date: Tue, 11 Feb 2025 00:50:21 GMT Message-Id: <202502110050.51B0oLGn046863@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 50202e05a356 - stable/14 - net: if_media for 100BASE-BX 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: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 50202e05a356881e125ec5da7871b67d6580aeb5 Auto-Submitted: auto-generated The branch stable/14 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=50202e05a356881e125ec5da7871b67d6580aeb5 commit 50202e05a356881e125ec5da7871b67d6580aeb5 Author: Kevin Bowling AuthorDate: 2025-02-08 23:49:46 +0000 Commit: Kevin Bowling CommitDate: 2025-02-11 00:48:35 +0000 net: if_media for 100BASE-BX d82c3e81: net: if_media for 100BASE-BX Renumber 1000BASE-BX and add 100BASE-BX sequentially I added this 1000BASE-BX in 78c63ed260fa20b3500aedfe41dc0dcae9593f51 but did not connect it to any code yet, appologize for the churn. 7835a4ad: net: if_media fix syntax/build Fixes: d82c3e815a5f ("net: if_media for 100BASE-BX") (cherry picked from commit d82c3e815a5fc0069562b69145ad695f9aa183f9) (cherry picked from commit 7835a4ad6948290c92ea55c7be34ae72f4e2b0bd) --- sys/net/ieee8023ad_lacp.c | 1 + sys/net/if_media.h | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/sys/net/ieee8023ad_lacp.c b/sys/net/ieee8023ad_lacp.c index c1e91f7fcb3e..f6a1be8004e0 100644 --- a/sys/net/ieee8023ad_lacp.c +++ b/sys/net/ieee8023ad_lacp.c @@ -1137,6 +1137,7 @@ lacp_compose_key(struct lacp_port *lp) case IFM_100_T2: case IFM_100_T: case IFM_100_SGMII: + case IFM_100_BX: key = IFM_100_TX; break; case IFM_1000_SX: diff --git a/sys/net/if_media.h b/sys/net/if_media.h index c03a4c87b355..534ad36da517 100644 --- a/sys/net/if_media.h +++ b/sys/net/if_media.h @@ -258,6 +258,8 @@ uint64_t ifmedia_baudrate(int); #define IFM_400G_AUI8 IFM_X(117) /* 400G-AUI8 */ #define IFM_50G_KR4 IFM_X(118) /* 50GBase-KR4 */ #define IFM_40G_LM4 IFM_X(119) /* 40GBase-LM4 */ +#define IFM_100_BX IFM_X(120) /* 100Base-BX */ +#define IFM_1000_BX IFM_X(121) /* 1000Base-BX */ /* * Please update ieee8023ad_lacp.c:lacp_compose_key() @@ -437,6 +439,7 @@ struct ifmedia_description { { IFM_100_T4, "100baseT4" }, \ { IFM_100_VG, "100baseVG" }, \ { IFM_100_T2, "100baseT2" }, \ + { IFM_100_BX, "100baseBX" }, \ { IFM_10_STP, "10baseSTP" }, \ { IFM_10_FL, "10baseFL" }, \ { IFM_1000_SX, "1000baseSX" }, \ @@ -784,6 +787,7 @@ struct ifmedia_baudrate { { IFM_ETHER | IFM_100_T4, IF_Mbps(100) }, \ { IFM_ETHER | IFM_100_VG, IF_Mbps(100) }, \ { IFM_ETHER | IFM_100_T2, IF_Mbps(100) }, \ + { IFM_ETHER | IFM_100_BX, IF_Mbps(100) }, \ { IFM_ETHER | IFM_1000_SX, IF_Mbps(1000) }, \ { IFM_ETHER | IFM_10_STP, IF_Mbps(10) }, \ { IFM_ETHER | IFM_10_FL, IF_Mbps(10) }, \