From nobody Sat Feb 8 23:52:57 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 4Yr7213JDqz5nQ48; Sat, 08 Feb 2025 23:52:57 +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 4Yr7212kwDz3Dk6; Sat, 08 Feb 2025 23:52:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739058777; 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=rFZYPQBxXdp8vERhDBWFwGZ2QNQJH6qN908GAagmmqA=; b=Il5uwoM4TbZPNbPNK3kr+5xCUGH4uQi2HgRJC4b2VKgRVV8FbmLTQLYRqHcuXvgZWRr8JR 9EWr0Qbk7Dtpr5lc28NTOcXCBErqSj/jHDqWCYAbOjxj1jxki8j0ajoyqxkJGiG888iNU3 3rWPtDp0x/DmKUx0OyVhSO9Ur49sdniJ9KivD9a3uevs8bMb/oyfWjskaflGLj7E9xSDUa OywHvdhYILqlLffb3hcDrU/8giIpbCQhwFV8rMocK+eZvCTYAefDh9Ze1dZ27p5KBp5lty lWCuZiSpesNZQ04AJqve04NmMRH2dQ/IMd8mPyezt1H6d23V6SENkXP6aUU+PA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739058777; 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=rFZYPQBxXdp8vERhDBWFwGZ2QNQJH6qN908GAagmmqA=; b=bzJ242XhswBsqR2rYul5TuqfXfUMiezplxa/VzjNww4NlRLsikDkSqgdj9jSS9R6NKek4+ TtpnXV/XX/PJugkwtdk+gLcOzl48RYH5ePzSsPLkvkkXtYAD/zERrUEOViuz/8CrLhbhxY zJLAcnVzg92NkyYq21t3VTdVERWK/5wX339Gj6/I3NPibMnk2tKj3A1VKA2JHvswNruaHH iwqp9y09ob/gTZT5S/RAOC+3W8OhkfedcDATHhUr+rN6QAONPhl2qaLzNz6d2X6f/x4W4W YW4s2MNgiAgXU/YSpLfsilTxtPAGhgVF06Zsjs6Bpl/blANl6jsTZRXGzJzuNg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739058777; a=rsa-sha256; cv=none; b=aMz8ROapDPtsRD+DEzocIeoKkiAMFaqFlOQqvjVWHCflyi2LrNLPxZP1W7ipxMi+y5ctEk fMwNWa8kfpoVvrOKI0fb/Jm+gsigWCZmOCuFqSvU5MnLYZ1EJ0Tm2iuPP0dkqPueUjCZ8v RUlaHEdQQVJ6WRhU91qN3fdh+VnEqhxbm6RQow3a+wUAzdD/3a/hPdg+A1Wr9r3qLjNFxJ coymOPBH/BkTYTPNgXboU20iM3kGND/kJIyn+7iD8rLLXYXs8gh53nUfsV+CarFSKKMvgf /u6l0p14gfpbLxi9sDi6baJZkix11ZnrfIIW77JEUZWXOzmb5jy6CAQqce/WRA== 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 4Yr721230DzZ8Y; Sat, 08 Feb 2025 23:52:57 +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 518NqvYa040897; Sat, 8 Feb 2025 23:52:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 518Nqv0B040894; Sat, 8 Feb 2025 23:52:57 GMT (envelope-from git) Date: Sat, 8 Feb 2025 23:52:57 GMT Message-Id: <202502082352.518Nqv0B040894@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: d82c3e815a5f - main - net: if_media for 100BASE-BX 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: d82c3e815a5fc0069562b69145ad695f9aa183f9 Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=d82c3e815a5fc0069562b69145ad695f9aa183f9 commit d82c3e815a5fc0069562b69145ad695f9aa183f9 Author: Kevin Bowling AuthorDate: 2025-02-08 23:49:46 +0000 Commit: Kevin Bowling CommitDate: 2025-02-08 23:49:46 +0000 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. MFC after: 3 days --- sys/net/ieee8023ad_lacp.c | 1 + sys/net/if_media.h | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/net/ieee8023ad_lacp.c b/sys/net/ieee8023ad_lacp.c index be047c4913fc..ba397e9e5d3b 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 2b308ccfea25..37cc4c509650 100644 --- a/sys/net/if_media.h +++ b/sys/net/if_media.h @@ -258,7 +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_1000_BX IFM_X(120) /* 1000Base-BX */ +#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() @@ -438,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" }, \ @@ -786,6 +788,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) }, \