From nobody Mon Jul 6 01:42:57 2026 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 4gtnDl2MLvz6kBgn for ; Mon, 06 Jul 2026 01:43:03 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gtnDk6PVZz3Xg3 for ; Mon, 06 Jul 2026 01:43:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783302182; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eDAnUvZ9a6X9oIgZlDLR0MwctqBrtL19BI/N3jLW72U=; b=Cqkc91wh6W0iMrfXvoB/h8tmfNl+TvVS92uslcbSBw/ePqm4UR13udJclXK7znQpgWBxBS niUVOwly7JsdBwQulKfgElfI2gQ7uVW1YYrl+Ac+/5PsI9DqoRGOTCW3/9sCjEqPHrZ/CD G3fZ4Pj1CUFvKzjjV/1/1lG8dQa0SxWbhR+K9S5gtDgzQRfG85W4QVN+0yeNJ+HWwE9pK3 F18HyEa7bYZnEsiB73nRE6JtNSDpuhOmls6D24qK14dfkmous+WggEIX4+SQ79lUA4wYb7 IunvLmLhSDkVdUus2raV266Gl1XqsqotqEveyFtaD4xndNYBDja5fKoAAvX7wA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783302182; a=rsa-sha256; cv=none; b=vf2/DfedW8iSOOoywI+pZVOmtFjachnOQ4ftht/pPEKhOtBt9JyQYhbQR13Micb1JulS0E +FhN6dumHlIriK9X+HmkHzz5YR1BwR8vGLB58cakONXSQEa4db63CqbD9kdHV/42nrBw+L WgY0BSM6+bjeWjrutaqULEusrQEDuuyYgNQi03SEIAWqAOQeqp6V9nykCUn3g8xZzmL5M9 wtO58yv5jRmFjbGXusuIdkfXOrzR9yk2V+eOaoaKxEMKprN+jZVZh9C42ce6lKQMVuayOO DxLhMe2RX+XMe6c6E7JCmTakGfq898njcWAWfmERH4z3Ee/p/KA8fPArKhstig== 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=1783302182; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eDAnUvZ9a6X9oIgZlDLR0MwctqBrtL19BI/N3jLW72U=; b=weOYQlKAC4LvPiH+bj47voAR+NAFGQNHLo8tBmC+7AvScIF9UEJYWl6hEYdS60kTDwBpX+ XnghShPq/EISnoqjuuPWcX6NQ3oOkYvZXfJX6+oygndjVl1kaFJUP4iA3s7yQSVBrgAY0R zIIbfo2zeQ/gdhS3kVFz9jaNsHqbM729pZIr5yfxvvCaYCb4j9RsJS43ISSxvy8Bryb8oo c3tJ3OTq3OoOxmor6XL2mnIC3llbuA0xYtO3Vqr1RBrD+r9ghArR3GTO2qVR0EHpI3ZOzV GVLhFTtrlqjb2V58wkeLWTlQmBBix1AY4M3o8TIA2UkwELT3m3CIyZNGerFY7g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gtnDk5HWzzkmY for ; Mon, 06 Jul 2026 01:43:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e469 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 06 Jul 2026 01:42:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Slava Shwartsman From: Konstantin Belousov Subject: git: f71aaa2b10ce - stable/15 - net/if_media.h: Add 800GBase-X and 200Gbit/s per lane support 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: f71aaa2b10ceeb73dbded21e380516855db1d6a5 Auto-Submitted: auto-generated Date: Mon, 06 Jul 2026 01:42:57 +0000 Message-Id: <6a4b0821.3e469.68e1033c@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f71aaa2b10ceeb73dbded21e380516855db1d6a5 commit f71aaa2b10ceeb73dbded21e380516855db1d6a5 Author: Slava Shwartsman AuthorDate: 2026-05-13 10:10:50 +0000 Commit: Konstantin Belousov CommitDate: 2026-07-06 01:35:48 +0000 net/if_media.h: Add 800GBase-X and 200Gbit/s per lane support (cherry picked from commit 51f313dbc7a28a7bd2013c205261f29f115eb0a7) --- sys/net/ieee8023ad_lacp.c | 3 +++ sys/net/if_media.h | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) diff --git a/sys/net/ieee8023ad_lacp.c b/sys/net/ieee8023ad_lacp.c index 77b5a5d53a67..72c49997f475 100644 --- a/sys/net/ieee8023ad_lacp.c +++ b/sys/net/ieee8023ad_lacp.c @@ -1268,6 +1268,9 @@ lacp_compose_key(struct lacp_port *lp) case IFM_400G_CR8: key = IFM_400G_FR8; break; + case IF_Gbps(800): + key = 15; + break; default: key = subtype; break; diff --git a/sys/net/if_media.h b/sys/net/if_media.h index 5cc8714219c8..5e2548d844c9 100644 --- a/sys/net/if_media.h +++ b/sys/net/if_media.h @@ -264,6 +264,20 @@ uint64_t ifmedia_baudrate(int); #define IFM_400G_CR8 IFM_X(123) /* 400GBase-CR8 */ #define IFM_10_T1S IFM_X(124) /* 10BASE-T1S */ #define IFM_10_T1L IFM_X(125) /* 10BASE-T1L */ +#define IFM_400G_KR2_PAM4 IFM_X(126) /* 400GBase-KR2 PAM4 */ +#define IFM_400G_CR2 IFM_X(127) /* 400GBase-CR2 */ +#define IFM_400G_SR2 IFM_X(128) /* 400GBase-SR2 */ +#define IFM_800G_FR8 IFM_X(129) /* 800GBase-FR8 */ +#define IFM_800G_LR8 IFM_X(130) /* 800GBase-LR8 */ +#define IFM_800G_DR8 IFM_X(131) /* 800GBase-DR8 */ +#define IFM_800G_AUI8_AC IFM_X(132) /* 800G-AUI8 active copper/optical */ +#define IFM_800G_AUI8 IFM_X(133) /* 800G-AUI8 */ +#define IFM_800G_SR8 IFM_X(134) /* 800GBase-SR8 */ +#define IFM_800G_CR8 IFM_X(135) /* 800GBase-CR8 */ +#define IFM_800G_KR8 IFM_X(136) /* 800GBase-KR8 (KR8) */ +#define IFM_800G_CR4 IFM_X(137) /* 800GBase-CR4 */ +#define IFM_800G_SR4 IFM_X(138) /* 800GBase-SR4 */ +#define IFM_800G_KR4_PAM4 IFM_X(139) /* 800GBase-KR4 PAM4 */ /* * Please update ieee8023ad_lacp.c:lacp_compose_key() @@ -558,6 +572,20 @@ struct ifmedia_description { { IFM_400G_CR8, "400GBase-CR8" }, \ { IFM_10_T1S, "10BASE-T1S" }, \ { IFM_10_T1L, "10BASE-T1L" }, \ + { IFM_400G_KR2_PAM4, "400GBase-KR2-PAM4" }, \ + { IFM_400G_CR2, "400GBase-CR2" }, \ + { IFM_400G_SR2, "400GBase-SR2" }, \ + { IFM_800G_FR8, "800GBase-FR8" }, \ + { IFM_800G_LR8, "800GBase-LR8" }, \ + { IFM_800G_DR8, "800GBase-DR8" }, \ + { IFM_800G_AUI8_AC, "800G-AUI8-AC" }, \ + { IFM_800G_AUI8, "800G-AUI8" }, \ + { IFM_800G_SR8, "800GBase-SR8" }, \ + { IFM_800G_KR8, "800GBase-KR8" }, \ + { IFM_800G_CR8, "800GBase-CR8" }, \ + { IFM_800G_CR4, "800GBase-CR4" }, \ + { IFM_800G_SR4, "800GBase-SR4" }, \ + { IFM_800G_KR4_PAM4, "800GBase-KR4-PAM4" }, \ { 0, NULL }, \ } @@ -909,6 +937,20 @@ struct ifmedia_baudrate { { IFM_ETHER | IFM_400G_CR8, IF_Gbps(400ULL) }, \ { IFM_ETHER | IFM_10_T1S, IF_Mbps(10) }, \ { IFM_ETHER | IFM_10_T1L, IF_Mbps(10) }, \ + { IFM_ETHER | IFM_400G_KR2_PAM4, IF_Gbps(400ULL) }, \ + { IFM_ETHER | IFM_400G_CR2, IF_Gbps(400ULL) }, \ + { IFM_ETHER | IFM_400G_SR2, IF_Gbps(400ULL) }, \ + { IFM_ETHER | IFM_800G_FR8, IF_Gbps(800ULL) }, \ + { IFM_ETHER | IFM_800G_LR8, IF_Gbps(800ULL) }, \ + { IFM_ETHER | IFM_800G_DR8, IF_Gbps(800ULL) }, \ + { IFM_ETHER | IFM_800G_AUI8_AC, IF_Gbps(800ULL) }, \ + { IFM_ETHER | IFM_800G_AUI8, IF_Gbps(800ULL) }, \ + { IFM_ETHER | IFM_800G_SR8, IF_Gbps(800ULL) }, \ + { IFM_ETHER | IFM_800G_CR8, IF_Gbps(800ULL) }, \ + { IFM_ETHER | IFM_800G_KR8, IF_Gbps(800ULL) }, \ + { IFM_ETHER | IFM_800G_CR4, IF_Gbps(800ULL) }, \ + { IFM_ETHER | IFM_800G_SR4, IF_Gbps(800ULL) }, \ + { IFM_ETHER | IFM_800G_KR4_PAM4, IF_Gbps(800ULL) }, \ \ { IFM_IEEE80211 | IFM_IEEE80211_FH1, IF_Mbps(1) }, \ { IFM_IEEE80211 | IFM_IEEE80211_FH2, IF_Mbps(2) }, \