From nobody Sun Mar 2 20:58:15 2025 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 4Z5Z6J2d8nz5qGSm; Sun, 02 Mar 2025 20:58:16 +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 4Z5Z6H6v35z3CwT; Sun, 02 Mar 2025 20:58:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740949096; 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=+v6rko3T6A8deV3oBlBfZO6XuamUdJBsX+9Ra/CVOyM=; b=PxwWjR850kvhh5tZbvtmt5zTyL/tNwCBwEreNiWgkjRWHkafeMGBQ1sQihFwEFIH7TpLxi dZk/ZTiiKxo+6ycIfF6bObN4UbpKYR1M9QnBzxR/JyonJdEqgYlfNx6hbKuvPehduaLjBo 81tGGfD4Q4SZZV8dgmdJ1WXw71WTJdqxs0GYtRWKRbSG0CX5ZIDoL0rjxFb19fSZEJQGE1 S/XuVrhxoXhha43y/Z/7/vHpGf4zKDFFmSI7GV1fgiVvj/7YtOwCU2QkFEYU3W0aLsMqR8 CbDw4C40UIk1cSo1Fnx5Vwk8r5LFyvXJFyggZCwfp/8qo4aZEgcIetShV9jR9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740949096; a=rsa-sha256; cv=none; b=ebJsDaP20Vhep2COiBSTVSqIpzjakoO1mLgcAGHNG41w3n9WPMpnY5n2kg/gghnOORgzJ5 4MNy9VzNoEYm3ap7xwU2JjBeJEm7hq2/H/4WccuV27D0MJirBePgkhygXVoGYWxr8HUi5n F6gUFLaeYtEJpY/7nIvh6MTdtYoQCiCW3y/oE1OcG1HqW/Zok3n+5x+boCND6vDIpzSSjS S2y1cfrkltkU31lF5Ek1i6KgGwusePd/+x+fo5bNBAjpnMsX8ENCgZATkU134BCQ0chEpY 2gCQ+Ysj16RpxL/tLooSKQDTAfB963zygfYFvZsPTr72ZeEMU7AvlwTYQHSjag== 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=1740949096; 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=+v6rko3T6A8deV3oBlBfZO6XuamUdJBsX+9Ra/CVOyM=; b=HzjaOu4ZrpCe/dkWl2PXLGAvUDr5Ud/nGPIfijihNZPtEn2M+PQC1o1dc+Iiykz2hgONVb Fs5a8VfWqr+mjPyxNJqojBfbSQsFy66l8FDugKA6U4azPLOxdXpwhnXhozkohD7wBJmJkb 23y8rtTAu590VoiDMqGyNDqyo3qsv0ooenSP/TNDO+s6j5xUP0bcfhrgduAcFs52UbMWLt a8ijinwN9VbNlaHq35Lrrc9ffXH1O0FoivKkF+H+phL5PcBALnwNhzrkmwmqoVb3XS6R5S 2l3OByiMZlDMrTGM3C5OziujdYRwrRmvaF/sWFj1Bhhcwu+JdhR4YCXVapJEag== 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 4Z5Z6H6PzLz2ZY; Sun, 02 Mar 2025 20:58:15 +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 522KwFSO043467; Sun, 2 Mar 2025 20:58:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 522KwFBW043464; Sun, 2 Mar 2025 20:58:15 GMT (envelope-from git) Date: Sun, 2 Mar 2025 20:58:15 GMT Message-Id: <202503022058.522KwFBW043464@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: e94246e0a2f3 - stable/13 - net: if_media for 1000Base-BX BiDi List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: e94246e0a2f36f955f481eb9b6f1faf9bd0d5cfd Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=e94246e0a2f36f955f481eb9b6f1faf9bd0d5cfd commit e94246e0a2f36f955f481eb9b6f1faf9bd0d5cfd Author: Tore Amundsen AuthorDate: 2024-11-13 05:08:06 +0000 Commit: Kevin Bowling CommitDate: 2025-03-02 20:57:59 +0000 net: if_media for 1000Base-BX BiDi 1000Base-BX uses two wavelengths, commonly 1310nm, 1490nm, 1550nm, or 1590nm, in a Coarse Wavelength Division Multiplexing (CWDM) arrangement so that a single fiber strand may carry both upstream and downstream. It is sometimes referred to as BiDi for bi-directional usage of one fiber. Optics must be paired such that the RX and TX wavelengths cross over, with one side often called U(pstream) and the other D(ownstream). This technology is useful for increasing link density or working around construction issues, and is also frequently used as a last mile delivery technology for FTTx. Sponsored by: BBOX.io (review/commits) Pull Request: https://github.com/freebsd/freebsd-src/pull/1518 (cherry picked from commit 78c63ed260fa20b3500aedfe41dc0dcae9593f51) --- sys/net/ieee8023ad_lacp.c | 1 + sys/net/if_media.h | 2 ++ 2 files changed, 3 insertions(+) diff --git a/sys/net/ieee8023ad_lacp.c b/sys/net/ieee8023ad_lacp.c index 746f8dc08746..3cac86a8f14b 100644 --- a/sys/net/ieee8023ad_lacp.c +++ b/sys/net/ieee8023ad_lacp.c @@ -1149,6 +1149,7 @@ lacp_compose_key(struct lacp_port *lp) case IFM_1000_KX: case IFM_1000_SGMII: case IFM_1000_CX_SGMII: + case IFM_1000_BX: key = IFM_1000_SX; break; case IFM_10G_LR: diff --git a/sys/net/if_media.h b/sys/net/if_media.h index 534ad36da517..a2cac00550ef 100644 --- a/sys/net/if_media.h +++ b/sys/net/if_media.h @@ -445,6 +445,7 @@ struct ifmedia_description { { IFM_1000_SX, "1000baseSX" }, \ { IFM_1000_LX, "1000baseLX" }, \ { IFM_1000_CX, "1000baseCX" }, \ + { IFM_1000_BX, "1000baseBX" }, \ { IFM_1000_T, "1000baseT" }, \ { IFM_HPNA_1, "homePNA" }, \ { IFM_10G_LR, "10Gbase-LR" }, \ @@ -793,6 +794,7 @@ struct ifmedia_baudrate { { IFM_ETHER | IFM_10_FL, IF_Mbps(10) }, \ { IFM_ETHER | IFM_1000_LX, IF_Mbps(1000) }, \ { IFM_ETHER | IFM_1000_CX, IF_Mbps(1000) }, \ + { IFM_ETHER | IFM_1000_BX, IF_Mbps(1000) }, \ { IFM_ETHER | IFM_1000_T, IF_Mbps(1000) }, \ { IFM_ETHER | IFM_HPNA_1, IF_Mbps(1) }, \ { IFM_ETHER | IFM_10G_LR, IF_Gbps(10ULL) }, \