summaryrefslogtreecommitdiffstats
path: root/drivers/infiniband/hw
diff options
context:
space:
mode:
authorRoland Dreier <roland@purestorage.com>2014-07-16 23:14:42 -0700
committerRoland Dreier <roland@purestorage.com>2014-07-16 23:14:42 -0700
commit56c5333cfc8488dd2118542b45ff3c6e89554c1e (patch)
tree67a2e5b404fd3695181bdab00874444112f0191a /drivers/infiniband/hw
parent46c1376db1b85ae412a7917cec148c6e60f79428 (diff)
parent652c1a05171695d21b84dd3a723606b50eeb80fd (diff)
downloadop-kernel-dev-56c5333cfc8488dd2118542b45ff3c6e89554c1e.zip
op-kernel-dev-56c5333cfc8488dd2118542b45ff3c6e89554c1e.tar.gz
Merge branches 'cxgb4' and 'mlx5' into for-next
Diffstat (limited to 'drivers/infiniband/hw')
-rw-r--r--drivers/infiniband/hw/mlx5/qp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/mlx5/qp.c b/drivers/infiniband/hw/mlx5/qp.c
index d13ddf1..bbbcf38 100644
--- a/drivers/infiniband/hw/mlx5/qp.c
+++ b/drivers/infiniband/hw/mlx5/qp.c
@@ -675,7 +675,7 @@ static int create_kernel_qp(struct mlx5_ib_dev *dev,
int err;
uuari = &dev->mdev.priv.uuari;
- if (init_attr->create_flags & ~IB_QP_CREATE_SIGNATURE_EN)
+ if (init_attr->create_flags & ~(IB_QP_CREATE_SIGNATURE_EN | IB_QP_CREATE_BLOCK_MULTICAST_LOOPBACK))
return -EINVAL;
if (init_attr->qp_type == MLX5_IB_QPT_REG_UMR)
OpenPOWER on IntegriCloud