Эх сурвалжийг харах

net/mlx5: Rename incorrect naming in IFC file

Remove a trailing underscore from the multicast/unicast names.

Signed-off-by: Mark Bloch <markb@mellanox.com>
Reviewed-by: Yishai Hadas <yishaih@mellanox.com>
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
Mark Bloch 6 жил өмнө
parent
commit
5d773ff41a

+ 2 - 2
drivers/infiniband/hw/mlx5/qp.c

@@ -1279,7 +1279,7 @@ static int create_raw_packet_qp_tir(struct mlx5_ib_dev *dev,
 
 
 	if (dev->rep)
 	if (dev->rep)
 		MLX5_SET(tirc, tirc, self_lb_block,
 		MLX5_SET(tirc, tirc, self_lb_block,
-			 MLX5_TIRC_SELF_LB_BLOCK_BLOCK_UNICAST_);
+			 MLX5_TIRC_SELF_LB_BLOCK_BLOCK_UNICAST);
 
 
 	err = mlx5_core_create_tir(dev->mdev, in, inlen, &rq->tirn);
 	err = mlx5_core_create_tir(dev->mdev, in, inlen, &rq->tirn);
 
 
@@ -1582,7 +1582,7 @@ static int create_rss_raw_qp_tir(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp,
 create_tir:
 create_tir:
 	if (dev->rep)
 	if (dev->rep)
 		MLX5_SET(tirc, tirc, self_lb_block,
 		MLX5_SET(tirc, tirc, self_lb_block,
-			 MLX5_TIRC_SELF_LB_BLOCK_BLOCK_UNICAST_);
+			 MLX5_TIRC_SELF_LB_BLOCK_BLOCK_UNICAST);
 
 
 	err = mlx5_core_create_tir(dev->mdev, in, inlen, &qp->rss_qp.tirn);
 	err = mlx5_core_create_tir(dev->mdev, in, inlen, &qp->rss_qp.tirn);
 
 

+ 1 - 1
drivers/net/ethernet/mellanox/mlx5/core/en_common.c

@@ -153,7 +153,7 @@ int mlx5e_refresh_tirs(struct mlx5e_priv *priv, bool enable_uc_lb)
 
 
 	if (enable_uc_lb)
 	if (enable_uc_lb)
 		MLX5_SET(modify_tir_in, in, ctx.self_lb_block,
 		MLX5_SET(modify_tir_in, in, ctx.self_lb_block,
-			 MLX5_TIRC_SELF_LB_BLOCK_BLOCK_UNICAST_);
+			 MLX5_TIRC_SELF_LB_BLOCK_BLOCK_UNICAST);
 
 
 	MLX5_SET(modify_tir_in, in, bitmask.self_lb_en, 1);
 	MLX5_SET(modify_tir_in, in, bitmask.self_lb_en, 1);
 
 

+ 2 - 2
include/linux/mlx5/mlx5_ifc.h

@@ -2559,8 +2559,8 @@ enum {
 };
 };
 
 
 enum {
 enum {
-	MLX5_TIRC_SELF_LB_BLOCK_BLOCK_UNICAST_    = 0x1,
-	MLX5_TIRC_SELF_LB_BLOCK_BLOCK_MULTICAST_  = 0x2,
+	MLX5_TIRC_SELF_LB_BLOCK_BLOCK_UNICAST    = 0x1,
+	MLX5_TIRC_SELF_LB_BLOCK_BLOCK_MULTICAST  = 0x2,
 };
 };
 
 
 struct mlx5_ifc_tirc_bits {
 struct mlx5_ifc_tirc_bits {