4 files changed, 13 insertions, 13 deletions

diff --git a/drivers/infiniband/hw/mlx4/cm.c b/drivers/infiniband/hw/mlx4/cm.c
index 56a593e0ae5d..39a488889fc7 100644
--- a/drivers/infiniband/hw/mlx4/cm.c
+++ b/drivers/infiniband/hw/mlx4/cm.c
@@ -372,7 +372,7 @@ int mlx4_ib_demux_cm_handler(struct ib_device *ibdev, int port, int *slave,
                 *slave = mlx4_ib_find_real_gid(ibdev, port, gid.global.interface_id);
                 if (*slave < 0) {
                         mlx4_ib_warn(ibdev, "failed matching slave_id by gid (0x%llx)\n",
-                                        gid.global.interface_id);
+                                     be64_to_cpu(gid.global.interface_id));
                         return -ENOENT;
                 }
                 return 0;
diff --git a/drivers/infiniband/hw/mlx4/cq.c b/drivers/infiniband/hw/mlx4/cq.c
index 543ecdd8667b..0176caa5792c 100644
--- a/drivers/infiniband/hw/mlx4/cq.c
+++ b/drivers/infiniband/hw/mlx4/cq.c
@@ -369,8 +369,7 @@ int mlx4_ib_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
         int err;
 
         mutex_lock(&cq->resize_mutex);
-
-        if (entries < 1) {
+        if (entries < 1 || entries > dev->dev->caps.max_cqes) {
                 err = -EINVAL;
                 goto out;
         }
@@ -381,7 +380,7 @@ int mlx4_ib_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
                 goto out;
         }
 
-        if (entries > dev->dev->caps.max_cqes) {
+        if (entries > dev->dev->caps.max_cqes + 1) {
                 err = -EINVAL;
                 goto out;
         }
@@ -394,7 +393,7 @@ int mlx4_ib_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
                 /* Can't be smaller than the number of outstanding CQEs */
                 outst_cqe = mlx4_ib_get_outstanding_cqes(cq);
                 if (entries < outst_cqe + 1) {
-                        err = 0;
+                        err = -EINVAL;
                         goto out;
                 }
 
diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c
index eb8e215f1613..ac6e2b710ea6 100644
--- a/drivers/infiniband/hw/mlx4/main.c
+++ b/drivers/infiniband/hw/mlx4/main.c
@@ -1269,8 +1269,7 @@ static int mlx4_ib_mcg_attach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
         struct mlx4_dev *dev = mdev->dev;
         struct mlx4_ib_qp *mqp = to_mqp(ibqp);
         struct mlx4_ib_steering *ib_steering = NULL;
-        enum mlx4_protocol prot = (gid->raw[1] == 0x0e) ?
-                MLX4_PROT_IB_IPV4 : MLX4_PROT_IB_IPV6;
+        enum mlx4_protocol prot = MLX4_PROT_IB_IPV6;
         struct mlx4_flow_reg_id reg_id;
 
         if (mdev->dev->caps.steering_mode ==
@@ -1284,8 +1283,10 @@ static int mlx4_ib_mcg_attach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
                                     !!(mqp->flags &
                                        MLX4_IB_QP_BLOCK_MULTICAST_LOOPBACK),
                                     prot, &reg_id.id);
-        if (err)
+        if (err) {
+                pr_err("multicast attach op failed, err %d\n", err);
                 goto err_malloc;
+        }
 
         reg_id.mirror = 0;
         if (mlx4_is_bonded(dev)) {
@@ -1348,9 +1349,7 @@ static int mlx4_ib_mcg_detach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
         struct net_device *ndev;
         struct mlx4_ib_gid_entry *ge;
         struct mlx4_flow_reg_id reg_id = {0, 0};
-
-        enum mlx4_protocol prot = (gid->raw[1] == 0x0e) ?
-                MLX4_PROT_IB_IPV4 : MLX4_PROT_IB_IPV6;
+        enum mlx4_protocol prot =  MLX4_PROT_IB_IPV6;
 
         if (mdev->dev->caps.steering_mode ==
             MLX4_STEERING_MODE_DEVICE_MANAGED) {
diff --git a/drivers/infiniband/hw/mlx4/qp.c b/drivers/infiniband/hw/mlx4/qp.c
index dfc6ca128a7e..ed2bd6701f9b 100644
--- a/drivers/infiniband/hw/mlx4/qp.c
+++ b/drivers/infiniband/hw/mlx4/qp.c
@@ -1696,8 +1696,10 @@ static int __mlx4_ib_modify_qp(struct ib_qp *ibqp,
                             qp->mlx4_ib_qp_type == MLX4_IB_QPT_PROXY_GSI ||
                             qp->mlx4_ib_qp_type == MLX4_IB_QPT_TUN_GSI) {
                                 err = handle_eth_ud_smac_index(dev, qp, (u8 *)attr->smac, context);
-                                if (err)
-                                        return -EINVAL;
+                                if (err) {
+                                        err = -EINVAL;
+                                        goto out;
+                                }
                                 if (qp->mlx4_ib_qp_type == MLX4_IB_QPT_PROXY_GSI)
                                         dev->qp1_proxy[qp->port - 1] = qp;
                         }