The branch main has been updated by kbowling:
URL:
https://cgit.FreeBSD.org/src/commit/?id=d82c3e815a5fc0069562b69145ad695f9aa183f9
commit d82c3e815a5fc0069562b69145ad695f9aa183f9
Author: Kevin Bowling <kbowl...@freebsd.org>
AuthorDate: 2025-02-08 23:49:46 +0000
Commit: Kevin Bowling <kbowl...@freebsd.org>
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) }, \
