Skip to content

Commit

Permalink
Missing bit of 200/400 support
Browse files Browse the repository at this point in the history
  • Loading branch information
danmcd committed Sep 28, 2023
1 parent 4d9fea3 commit e567e45
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions usr/src/uts/common/io/mlxcx/mlxcx_cmd.c
Original file line number Diff line number Diff line change
Expand Up @@ -474,8 +474,8 @@ mlxcx_eth_proto_to_string(mlxcx_eth_proto_t p, mlxcx_ext_eth_proto_t ep,
(void) strlcat(buf, "50GBASE_CR2|", size);

/* Now, for the extended bits... */
if (ep & MLXCX_EXTPROTO_SGMII_100M)
(void) strlcat(buf, "SGMII_100M|", size);
if (ep & MLXCX_EXTPROTO_SGMII_100BASE)
(void) strlcat(buf, "SGMII_100BASE|", size);
if (ep & MLXCX_EXTPROTO_1000BASE_X_SGMII)
(void) strlcat(buf, "1000BASE_X_SGMII|", size);
if (ep & MLXCX_EXTPROTO_5GBASE_R)
Expand Down
4 changes: 2 additions & 2 deletions usr/src/uts/common/io/mlxcx/mlxcx_gld.c
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ mlxcx_speed_to_bits(mlxcx_eth_proto_t proto, mlxcx_ext_eth_proto_t ext_proto)
}

switch (ext_proto) {
case MLXCX_EXTPROTO_SGMII_100M:
case MLXCX_EXTPROTO_SGMII_100BASE:
return (100ULL * MBITS);
case MLXCX_EXTPROTO_1000BASE_X_SGMII:
return (1000ULL * MBITS);
Expand Down Expand Up @@ -284,7 +284,7 @@ mlxcx_mac_media(mlxcx_port_t *port)
}

switch (port->mlp_ext_oper_proto) {
case MLXCX_EXTPROTO_SGMII_100M:
case MLXCX_EXTPROTO_SGMII_100BASE:
return (ETHER_MEDIA_100_SGMII);
case MLXCX_EXTPROTO_1000BASE_X_SGMII:
return (ETHER_MEDIA_1000_SGMII);
Expand Down
2 changes: 1 addition & 1 deletion usr/src/uts/common/io/mlxcx/mlxcx_reg.h
Original file line number Diff line number Diff line change
Expand Up @@ -2325,7 +2325,7 @@ typedef enum {

#define MLXCX_PROTO_100M (MLXCX_PROTO_SGMII_100BASE | \
MLXCX_PROTO_100BASE_T)
#define MLXCX_EXTPROTO_100M MLXCX_EXTPROTO_SGMII_100M
#define MLXCX_EXTPROTO_100M MLXCX_EXTPROTO_SGMII_100BASE

#define MLXCX_PROTO_1G (MLXCX_PROTO_1000BASE_KX | MLXCX_PROTO_SGMII)
#define MLXCX_EXTPROTO_1G MLXCX_EXTPROTO_1000BASE_X_SGMII
Expand Down

0 comments on commit e567e45

Please sign in to comment.