diff options
| author | Roland Dreier <roland@purestorage.com> | 2014-07-17 08:14:42 +0200 |
|---|---|---|
| committer | Roland Dreier <roland@purestorage.com> | 2014-07-17 08:14:42 +0200 |
| commit | 56c5333cfc8488dd2118542b45ff3c6e89554c1e (patch) | |
| tree | 67a2e5b404fd3695181bdab00874444112f0191a /drivers/infiniband/hw | |
| parent | RDMA/cxgb4: Call iwpm_init() only once (diff) | |
| parent | IB/mlx5: Enable "block multicast loopback" for kernel consumers (diff) | |
| download | linux-56c5333cfc8488dd2118542b45ff3c6e89554c1e.tar.xz linux-56c5333cfc8488dd2118542b45ff3c6e89554c1e.zip | |
Merge branches 'cxgb4' and 'mlx5' into for-next
Diffstat (limited to 'drivers/infiniband/hw')
| -rw-r--r-- | drivers/infiniband/hw/mlx5/qp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/mlx5/qp.c b/drivers/infiniband/hw/mlx5/qp.c index d13ddf1c0033..bbbcf389272c 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) |