1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c
index 0f7027e7db13..e1e558a3d692 100644
--- a/drivers/infiniband/hw/mlx4/main.c
+++ b/drivers/infiniband/hw/mlx4/main.c
@@ -910,8 +910,7 @@ static int __mlx4_ib_default_rules_match(struct ib_qp *qp,
         const struct default_rules *pdefault_rules = default_table;
         u8 link_layer = rdma_port_get_link_layer(qp->device, flow_attr->port);
 
-        for (i = 0; i < sizeof(default_table)/sizeof(default_table[0]); i++,
-             pdefault_rules++) {
+        for (i = 0; i < ARRAY_SIZE(default_table); i++, pdefault_rules++) {
                 __u32 field_types[IB_FLOW_SPEC_SUPPORT_LAYERS];
                 memset(&field_types, 0, sizeof(field_types));
 
@@ -965,8 +964,7 @@ static int __mlx4_ib_create_default_rules(
         int size = 0;
         int i;
 
-        for (i = 0; i < sizeof(pdefault_rules->rules_create_list)/
-                        sizeof(pdefault_rules->rules_create_list[0]); i++) {
+        for (i = 0; i < ARRAY_SIZE(pdefault_rules->rules_create_list); i++) {
                 int ret;
                 union ib_flow_spec ib_spec;
                 switch (pdefault_rules->rules_create_list[i]) {
@@ -2007,6 +2005,7 @@ static void *mlx4_ib_add(struct mlx4_dev *dev)
                 (1ull << IB_USER_VERBS_CMD_ALLOC_PD)            |
                 (1ull << IB_USER_VERBS_CMD_DEALLOC_PD)          |
                 (1ull << IB_USER_VERBS_CMD_REG_MR)              |
+                (1ull << IB_USER_VERBS_CMD_REREG_MR)            |
                 (1ull << IB_USER_VERBS_CMD_DEREG_MR)            |
                 (1ull << IB_USER_VERBS_CMD_CREATE_COMP_CHANNEL) |
                 (1ull << IB_USER_VERBS_CMD_CREATE_CQ)           |
@@ -2059,6 +2058,7 @@ static void *mlx4_ib_add(struct mlx4_dev *dev)
         ibdev->ib_dev.req_notify_cq     = mlx4_ib_arm_cq;
         ibdev->ib_dev.get_dma_mr        = mlx4_ib_get_dma_mr;
         ibdev->ib_dev.reg_user_mr       = mlx4_ib_reg_user_mr;
+        ibdev->ib_dev.rereg_user_mr     = mlx4_ib_rereg_user_mr;
         ibdev->ib_dev.dereg_mr          = mlx4_ib_dereg_mr;
         ibdev->ib_dev.alloc_fast_reg_mr = mlx4_ib_alloc_fast_reg_mr;
         ibdev->ib_dev.alloc_fast_reg_page_list = mlx4_ib_alloc_fast_reg_page_list;