aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/mellanox/mlx4/mlx4.h
diff options
context:
space:
mode:
authorShani Michaeli <shanim@mellanox.com>2013-02-06 11:19:08 -0500
committerRoland Dreier <roland@purestorage.com>2013-02-21 14:37:23 -0500
commitb20e519a81d648aebfbb90811743cc86cd469a48 (patch)
tree92acd35e8f0d68a33547c68d154004b7561b909f /drivers/net/ethernet/mellanox/mlx4/mlx4.h
parentaee38fadd25989c3e6d99fc08752e2d87601ffc1 (diff)
mlx4_core: Rename MPT-related functions to have mpt_ prefix
The MPT - Memory Protection Table - is used by both memory windows and memory regions. Hence, all MPT references are relevant for both types of memory objects. Rename the relevant functions to start with mpt_ instead of the current mr_ prefix. Signed-off-by: Haggai Eran <haggaie@mellanox.com> Signed-off-by: Shani Michaeli <shanim@mellanox.com> Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com> Signed-off-by: Roland Dreier <roland@purestorage.com>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx4/mlx4.h')
-rw-r--r--drivers/net/ethernet/mellanox/mlx4/mlx4.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/mlx4.h b/drivers/net/ethernet/mellanox/mlx4/mlx4.h
index 116c5c29d2d1..5075236a140d 100644
--- a/drivers/net/ethernet/mellanox/mlx4/mlx4.h
+++ b/drivers/net/ethernet/mellanox/mlx4/mlx4.h
@@ -118,10 +118,10 @@ enum {
118 MLX4_NUM_CMPTS = MLX4_CMPT_NUM_TYPE << MLX4_CMPT_SHIFT 118 MLX4_NUM_CMPTS = MLX4_CMPT_NUM_TYPE << MLX4_CMPT_SHIFT
119}; 119};
120 120
121enum mlx4_mr_state { 121enum mlx4_mpt_state {
122 MLX4_MR_DISABLED = 0, 122 MLX4_MPT_DISABLED = 0,
123 MLX4_MR_EN_HW, 123 MLX4_MPT_EN_HW,
124 MLX4_MR_EN_SW 124 MLX4_MPT_EN_SW
125}; 125};
126 126
127#define MLX4_COMM_TIME 10000 127#define MLX4_COMM_TIME 10000
@@ -871,10 +871,10 @@ int __mlx4_cq_alloc_icm(struct mlx4_dev *dev, int *cqn);
871void __mlx4_cq_free_icm(struct mlx4_dev *dev, int cqn); 871void __mlx4_cq_free_icm(struct mlx4_dev *dev, int cqn);
872int __mlx4_srq_alloc_icm(struct mlx4_dev *dev, int *srqn); 872int __mlx4_srq_alloc_icm(struct mlx4_dev *dev, int *srqn);
873void __mlx4_srq_free_icm(struct mlx4_dev *dev, int srqn); 873void __mlx4_srq_free_icm(struct mlx4_dev *dev, int srqn);
874int __mlx4_mr_reserve(struct mlx4_dev *dev); 874int __mlx4_mpt_reserve(struct mlx4_dev *dev);
875void __mlx4_mr_release(struct mlx4_dev *dev, u32 index); 875void __mlx4_mpt_release(struct mlx4_dev *dev, u32 index);
876int __mlx4_mr_alloc_icm(struct mlx4_dev *dev, u32 index); 876int __mlx4_mpt_alloc_icm(struct mlx4_dev *dev, u32 index);
877void __mlx4_mr_free_icm(struct mlx4_dev *dev, u32 index); 877void __mlx4_mpt_free_icm(struct mlx4_dev *dev, u32 index);
878u32 __mlx4_alloc_mtt_range(struct mlx4_dev *dev, int order); 878u32 __mlx4_alloc_mtt_range(struct mlx4_dev *dev, int order);
879void __mlx4_free_mtt_range(struct mlx4_dev *dev, u32 first_seg, int order); 879void __mlx4_free_mtt_range(struct mlx4_dev *dev, u32 first_seg, int order);
880 880