Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma

[sfrench/cifs-2.6.git] / drivers / infiniband / core / cma.c

diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index 50c53409ceb61bf6e992a979e0c262b322628ac1..fabca5e51e3d44e73fe15fd674b72d86953b9442 100644 (file)
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -2642,7 +2642,7 @@ int rdma_set_ack_timeout(struct rdma_cm_id *id, u8 timeout)
 {
        struct rdma_id_private *id_priv;
 
-       if (id->qp_type != IB_QPT_RC)
+       if (id->qp_type != IB_QPT_RC && id->qp_type != IB_QPT_XRC_INI)
                return -EINVAL;
 
        id_priv = container_of(id, struct rdma_id_private, id);