From nobody Wed Nov 13 05:27:50 2024 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 4XpBd307KXz5dBr0; Wed, 13 Nov 2024 05:27: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 4XpBd26m5Tz46fx; Wed, 13 Nov 2024 05:27:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731475671; 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=pHtxtSB2gIZN+FlxXyM7h5arxCN2/KpEilTkSWcPp+M=; b=fzyabjRJHwC2rSmpo+veYMGTAm1sXLxEA3S7iojuIUHXHnJoKr9RYLvp+qhjmPTVbVxZdu /Pxy89+44orq8Xiqf5HHxvWO/XxhJFP5nvFioDbAlunA37WCinq4tU3XE0ui2iYyrDuenC yxhKKLX+2BeKWlgGiDRL50xKS59h8oFqHI8+m/QWdmqZPy8yGFg2ouIgacrFj+QRmzsuEx UV+S9c1+Y9kGzaGYdPf7CJiIL/vrFUEiK34/D9T2zgsAQdmaFjCz8gdY9I638If6STukvS RdMHUSGjRG17h7CMNYbnq1pcl/4td2nLoBtIMG22BBkhIZt6oo/to7XsbLpyaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731475670; 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=pHtxtSB2gIZN+FlxXyM7h5arxCN2/KpEilTkSWcPp+M=; b=bDR2Aw1DrlRLosh/tpv3x0ukR8LCbrYLwEqgOHufwpUsJVmziY8ePyFyS7gzC7lJlNOMRH EI8gcmg4yMqBwcicDSFIp5/nhbEAb4iE73VrLIhXRTk+ypTvBpH2H8f9uyHuYaWKioosP+ 85eyHCDqRx6wqIr2Jt5OdEVRAaknJF3mE/c7O4zsR6kwL0obP5dKj0KkpkdoDDI5ZLRcIL oYzZfQq6ItmXwdpqE3ecy9rHKmJlCC9IU/PQELjZ+bl09smA+W7/RponQ7DW6vZFAODQQ5 YB68ioqRNvCBsEh6HKW9EsEimMLfQCpXlQc/PESdwCSiPWeZ2LOXz/RsL7Wa/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731475670; a=rsa-sha256; cv=none; b=AXrMAdhwzgzmT89pc7+plOySt/3dYOb0lcWX0+Y2BkKTeM2TMEqNTW2rzBJk7q04BSpKdf ShBnooUArmV0lg6xljOwYalc9lqMh+XYKKT5gyZevocd2UKfmq5VPNEi9/9UZ8xfpLiTtC NKLGNPSxPuBznNZrXjhKTwJL6AM6hutFKSNsr4bPwD5Q6U/EOcrqSxojg7FC5W9DgCkoTL aMU3mb7RiCISx33g8rZ/Z0AqMOtWKueenZZ8SqVJau5Tg8+5+1X75FKeE+KXOTbVS8v34u 7p+u1bp5792F61dLZ1rw1RvWLm/zTUddyOTiI3Rpb4wZ+9/8aEJhX8UdLmv0Yw== 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 4XpBd262HpzhrH; Wed, 13 Nov 2024 05:27:50 +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 4AD5RoTn073317; Wed, 13 Nov 2024 05:27:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AD5Ro75073314; Wed, 13 Nov 2024 05:27:50 GMT (envelope-from git) Date: Wed, 13 Nov 2024 05:27:50 GMT Message-Id: <202411130527.4AD5Ro75073314@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: 78c63ed260fa - main - 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/main X-Git-Reftype: branch X-Git-Commit: 78c63ed260fa20b3500aedfe41dc0dcae9593f51 Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=78c63ed260fa20b3500aedfe41dc0dcae9593f51 commit 78c63ed260fa20b3500aedfe41dc0dcae9593f51 Author: Tore Amundsen AuthorDate: 2024-11-13 05:08:06 +0000 Commit: Kevin Bowling CommitDate: 2024-11-13 05:27:32 +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. MFC after: 3 days Sponsored by: BBOX.io (review/commits) Pull Request: https://github.com/freebsd/freebsd-src/pull/1518 --- sys/net/ieee8023ad_lacp.c | 1 + sys/net/if_media.h | 3 +++ 2 files changed, 4 insertions(+) diff --git a/sys/net/ieee8023ad_lacp.c b/sys/net/ieee8023ad_lacp.c index c1e91f7fcb3e..be047c4913fc 100644 --- a/sys/net/ieee8023ad_lacp.c +++ b/sys/net/ieee8023ad_lacp.c @@ -1146,6 +1146,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 c03a4c87b355..2b308ccfea25 100644 --- a/sys/net/if_media.h +++ b/sys/net/if_media.h @@ -258,6 +258,7 @@ 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_1000_BX IFM_X(120) /* 1000Base-BX */ /* * Please update ieee8023ad_lacp.c:lacp_compose_key() @@ -442,6 +443,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" }, \ @@ -789,6 +791,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) }, \