diff --git a/[refs] b/[refs] index 916ae4f06353..9152e7651c34 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 18c441a6c3741991bfb87a3c6c541d30f0eb9c7c +refs/heads/master: 2622e18ef407a8e8e3ddc3d6f0c77b756c493798 diff --git a/trunk/drivers/infiniband/core/cm.c b/trunk/drivers/infiniband/core/cm.c index 42a7a9bae44e..4104ea2427c2 100644 --- a/trunk/drivers/infiniband/core/cm.c +++ b/trunk/drivers/infiniband/core/cm.c @@ -889,6 +889,8 @@ static void cm_destroy_id(struct ib_cm_id *cm_id, int err) break; case IB_CM_ESTABLISHED: spin_unlock_irq(&cm_id_priv->lock); + if (cm_id_priv->qp_type == IB_QPT_XRC_TGT) + break; ib_send_cm_dreq(cm_id, NULL, 0); goto retest; case IB_CM_DREQ_SENT: