IB/mlx5: Rename 400G_8X speed to comply to naming convention

Rename 400G_8X speed to comply to naming convention.

Signed-off-by: Patrisious Haddad <phaddad@nvidia.com>
Reviewed-by: Mark Zhang <markzhang@nvidia.com>
Link: https://lore.kernel.org/r/ac98447cac8379a43fbdb36d56e5fb2b741a97ff.1695204156.git.leon@kernel.org
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
Signed-off-by: Leon Romanovsky <leon@kernel.org>

diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
index 457d5ac7ad0400271a95bac504ea69637ad68378..428abc916509c50abac6efce75c73acbf4291e4b 100644 (file)
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@ -443,7 +443,7 @@ static int translate_eth_ext_proto_oper(u32 eth_proto_oper, u16 *active_speed,
                *active_width = IB_WIDTH_2X;
                *active_speed = IB_SPEED_NDR;
                break;
-       case MLX5E_PROT_MASK(MLX5E_400GAUI_8):
+       case MLX5E_PROT_MASK(MLX5E_400GAUI_8_400GBASE_CR8):
                *active_width = IB_WIDTH_8X;
                *active_speed = IB_SPEED_HDR;
                break;

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/port.c b/drivers/net/ethernet/mellanox/mlx5/core/port.c
index 43423543f34c6dcae79a91619b8d3a98ded5e8d3..7d8c732818f201673c8085904d78b426d5398c81 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/port.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/port.c
@@ -1098,7 +1098,7 @@ static const u32 mlx5e_ext_link_speed[MLX5E_EXT_LINK_MODES_NUMBER] = {
        [MLX5E_CAUI_4_100GBASE_CR4_KR4] = 100000,
        [MLX5E_100GAUI_2_100GBASE_CR2_KR2] = 100000,
        [MLX5E_200GAUI_4_200GBASE_CR4_KR4] = 200000,
-       [MLX5E_400GAUI_8] = 400000,
+       [MLX5E_400GAUI_8_400GBASE_CR8] = 400000,
        [MLX5E_100GAUI_1_100GBASE_CR_KR] = 100000,
        [MLX5E_200GAUI_2_200GBASE_CR2_KR2] = 200000,
        [MLX5E_400GAUI_4_400GBASE_CR4_KR4] = 400000,

diff --git a/include/linux/mlx5/port.h b/include/linux/mlx5/port.h
index 794001ebd00336d0ccc3d9aded53af17b1e3f365..26092c78a9850eb8060b2f61c4f89bc0ef7c7bc9 100644 (file)
--- a/include/linux/mlx5/port.h
+++ b/include/linux/mlx5/port.h
@@ -115,7 +115,7 @@ enum mlx5e_ext_link_mode {
        MLX5E_100GAUI_1_100GBASE_CR_KR          = 11,
        MLX5E_200GAUI_4_200GBASE_CR4_KR4        = 12,
        MLX5E_200GAUI_2_200GBASE_CR2_KR2        = 13,
-       MLX5E_400GAUI_8                         = 15,
+       MLX5E_400GAUI_8_400GBASE_CR8            = 15,
        MLX5E_400GAUI_4_400GBASE_CR4_KR4        = 16,
        MLX5E_800GAUI_8_800GBASE_CR8_KR8        = 19,
        MLX5E_EXT_LINK_MODES_NUMBER,