From nobody Tue Feb 11 00:52:49 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 4YsNG96Hn5z5n6hp; Tue, 11 Feb 2025 00:52:49 +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 4YsNG93bVfz3kdD; Tue, 11 Feb 2025 00:52:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739235169; 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=1+lRWwGvm768X7ZZah897K4zwhxvVeizv5/fTM669tw=; b=nqIvCagUjPcqKgEbV0yXbyrjY8bEgGwxgqKKxTfzbuqgtwCUbvzMcLZ97XJNneorTSxBP6 Jdv8xMkiZfhZoHPKdJQQt60sAdxoCYMqkHXcSciMWySCIRWP3K/cXPV4p6ZHeUlcMjV6i+ lWsQp9gBzzQEDgjB2mNUNKXUXp+B68+tnCNSX5F8IphUvxFokyeAXfHkShrHJqXOKRvzDR iGtKpVKVRPsysAhJQR6T2WjkU/3QVKOY+pgL+zLRMOE6e8/F0fsZMUuC9CFFDrslt+TwpO Xx3kkyLZpdRHicIWJDyfAICt7H/wCULDpAb5ZmROgio8FMNHhtv9dVtP9xPyaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739235169; 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=1+lRWwGvm768X7ZZah897K4zwhxvVeizv5/fTM669tw=; b=ZNnpQsr5K8H0FO707XUkjsVLgtfyldRWsoNL/QHPcJPv9RRr/IQVOfJXagr2NVO/mesc0t nTufN+448K5AZwXgudPlvSm1kpDYThStrzzzWO1SYRJOC888SF6oyZFfdU7nEH8kccARKe 44dYOCxKIx+JZDfhXw5nH9DAcx996JkgxN5zYm3sLBWEHcnctRzfsT+w+bsh8c1PcwlEpg xBjiBLYyZLzxW+t9wj1/f9mAnjqBNaMyDCRLIgzyNAmYnsnN6TkyucaY3hk7lbZwrO4+8Y xR1+OQmYQlDPhxnkjYfwjavVQSCV8RwycZq3zMFzSqslVI6QrSTKUfXnwKIy7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739235169; a=rsa-sha256; cv=none; b=KL92u0jzeXYFghHCjwKl79Ls983okb50+e2oEGEhFl2Vi1+vdMygGKeo+X0nofDy4x89ld p0VEwJ+GaqaU1negJgDG7eF2NIpLRn0zzSzWf37BZJcuYHjcHFe7gfO/J6qTno6agnHXRn qNiocJVKEyYv/vu0wxRO00IkOkNJV4XCiXsM/poqAvIYbGJHya+iFbF3sK0Hc7O1wCFg5d vq3IzhYjyxSxpIvteQVU3VHUsRiNUjxr+klV46ZLceQ9HXHgK2CpDf1aZUHR9LSSYNTKBh VF5smLbIb1i5LWkXOJd2BAmWTc/EFxhvKH9BEd9+ggVLPMOdxEnELp/VpH0VlA== 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 4YsNG935NTzqv3; Tue, 11 Feb 2025 00:52:49 +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 51B0qn4q055316; Tue, 11 Feb 2025 00:52:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51B0qnXM055313; Tue, 11 Feb 2025 00:52:49 GMT (envelope-from git) Date: Tue, 11 Feb 2025 00:52:49 GMT Message-Id: <202502110052.51B0qnXM055313@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: a32cc87cc0a0 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: a32cc87cc0a0dae1984665bd9e0727c1eeac6c96 Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=a32cc87cc0a0dae1984665bd9e0727c1eeac6c96 commit a32cc87cc0a0dae1984665bd9e0727c1eeac6c96 Author: Kevin Bowling AuthorDate: 2025-02-08 23:49:46 +0000 Commit: Kevin Bowling CommitDate: 2025-02-11 00:52:16 +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 049e8bf6e1ee..746f8dc08746 100644 --- a/sys/net/ieee8023ad_lacp.c +++ b/sys/net/ieee8023ad_lacp.c @@ -1139,6 +1139,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) }, \