Skip to content

Commit

Permalink
net: if_media for 100BASE-BX
Browse files Browse the repository at this point in the history 
d82c3e81:
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.

7835a4ad:
net: if_media fix syntax/build

Fixes:		d82c3e815a5f ("net: if_media for 100BASE-BX")

(cherry picked from commit d82c3e815a5fc0069562b69145ad695f9aa183f9)
(cherry picked from commit 7835a4ad6948290c92ea55c7be34ae72f4e2b0bd)
  • Loading branch information
@kev009 @fichtner
kev009 authored and fichtner committed Feb 18, 2025
1 parent f0a184b commit 6e76039
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 0 deletions.
1 change: 1 addition & 0 deletions sys/net/ieee8023ad_lacp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 4 additions & 0 deletions sys/net/if_media.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +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_100_BX IFM_X(120) /* 100Base-BX */
#define IFM_1000_BX IFM_X(121) /* 1000Base-BX */

/*
* Please update ieee8023ad_lacp.c:lacp_compose_key()
Expand Down Expand Up @@ -437,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" }, \
Expand Down Expand Up @@ -784,6 +787,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) }, \
Expand Down

0 comments on commit 6e76039

Please sign in to comment.