From nobody Sun Mar 2 20:57:10 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 4Z5Z532mHcz5qGNv; Sun, 02 Mar 2025 20:57:11 +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 4Z5Z523w4Sz3C4h; Sun, 02 Mar 2025 20:57:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740949030; 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=DCz0Y/L/LU1Wloh3jMb/p0aviXXmYklxagqqD3Q2sbY=; b=KYJhPxplkSBH4+JpRP1H9b94ob0m/IMg3otneiJftxsACq7cJzVXJr4k+rtLmzB90OuEgX Rb5dRuQ6R5Lnk2q5R7N888FJ26/Zhidx4CVVgtFviWH4Hu6/B4wrWAIYjVGpFtsOC/RMS9 3R5qGI0fQEOLR82oBZlcomJ2G0dt5DO1wzy4+JcSqVkozqUwa7WPFam5iFjlK8l1ILVZFJ VaxI2ejd36FIXhEAb7VObKVUPCOMbZIxjHYiC9Ve7SD8nKxbTtexxQPMPNgCIOAZHUBX8W HNhPn08Ni8rFbaJUQtOnljQMAxlUymrwqky8xvbk31pVlWS4XfWp7X5jUyqnkA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740949030; a=rsa-sha256; cv=none; b=wcg3c0k1xD6ZsGPDNltX3hi6aT+3vWR+zAz9K8aMf7I/3vyEPPNAaOpJEcZtjn9HpSYKKL 58ya2bRFTNhlG9t83NeZSjs6UrCiau2OI+CX2mRD9QkBNYVR/+mn3QqxfRipBYnTgYCkLP sTutawlINAs+D40ks2F/QiY8XrlXgC6dEvZhdkYPziv4rU2+wic2du3pQJ8tMMuPhp3jhe x6o6mtk/0j7Acjykyhl0P/Cdrz1JbaifsF18QfHRJAO9xHxST2Twv09ku+CxsRfSXilAY0 LjABLyOJ7R1phPBT8O/YCkxmhNCaYq2HlRK3CzZXvV5T2PAHn4ehd0EUFi58+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=1740949030; 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=DCz0Y/L/LU1Wloh3jMb/p0aviXXmYklxagqqD3Q2sbY=; b=KunHz+npuuO1W+YSik1PjgIfiFohDPzzwkWCTcw8Sbt0dd7C2owOvwRQBfkygRadAiIqLE Bu3Iz9Pp5Fq08OZDF3P0KLs31KgYg3Csi0BudsjRdklTOzVlVRNLGKSvnBeJbw/cg92xb9 qhgosNweS/6qyKhlzzGNcIgO4L2cWt7KsFE+xzTqSES/QMbP9ohCsdUaBYOXWipfjGQ+q0 HAP09muveinXxd177DEc+RHb6GWB3oS4r2F3UKDIuf1uY4nZ4aKHN7Pm2rfJvdELGyH0Uv 61TVqiJIgPqE31S5sQmIaEhgIfDt5HemCtWklr4RaWd2/q4WNAeEK+4UnEl0/g== 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 4Z5Z522vMJz2nf; Sun, 02 Mar 2025 20:57:10 +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 522KvATN043055; Sun, 2 Mar 2025 20:57:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 522KvAKt043052; Sun, 2 Mar 2025 20:57:10 GMT (envelope-from git) Date: Sun, 2 Mar 2025 20:57:10 GMT Message-Id: <202503022057.522KvAKt043052@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: 85b69389ce56 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 85b69389ce56f091281aa2543dea31950f68a054 Auto-Submitted: auto-generated The branch stable/14 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=85b69389ce56f091281aa2543dea31950f68a054 commit 85b69389ce56f091281aa2543dea31950f68a054 Author: Tore Amundsen AuthorDate: 2024-11-13 05:08:06 +0000 Commit: Kevin Bowling CommitDate: 2025-03-02 20:56:38 +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 f6a1be8004e0..ba397e9e5d3b 100644 --- a/sys/net/ieee8023ad_lacp.c +++ b/sys/net/ieee8023ad_lacp.c @@ -1147,6 +1147,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) }, \