From cbe6bf09bac5d8d850bc958dc24fafd11a028cb6 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Mon, 2 Jul 2007 14:36:19 -0700 Subject: [PATCH] --- yaml --- r: 59363 b: refs/heads/master c: 29c2731cbfa9d5b560a73461775f2be03b46dd4c h: refs/heads/master i: 59361: 5f0be1a181e1a8c13251c0dd2c8aa636f25c8793 59359: e0d914308955d8ff2d5a70e8296c0458a1ae6213 v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/core/cm.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8abf14ba5b9e..4b9aa49630cc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5d861be8c87b8a8f8e0f58b3b8864f31da7ee9c3 +refs/heads/master: 29c2731cbfa9d5b560a73461775f2be03b46dd4c diff --git a/trunk/drivers/infiniband/core/cm.c b/trunk/drivers/infiniband/core/cm.c index c7007c45889a..9135a8c1d4ac 100644 --- a/trunk/drivers/infiniband/core/cm.c +++ b/trunk/drivers/infiniband/core/cm.c @@ -2794,7 +2794,6 @@ static int cm_sidr_req_handler(struct cm_work *work) work->mad_recv_wc->recv_buf.grh, &cm_id_priv->av); cm_id_priv->id.remote_id = sidr_req_msg->request_id; - cm_id_priv->id.state = IB_CM_SIDR_REQ_RCVD; cm_id_priv->tid = sidr_req_msg->hdr.tid; atomic_inc(&cm_id_priv->work_count); @@ -2804,6 +2803,7 @@ static int cm_sidr_req_handler(struct cm_work *work) spin_unlock_irq(&cm.lock); goto out; /* Duplicate message. */ } + cm_id_priv->id.state = IB_CM_SIDR_REQ_RCVD; cur_cm_id_priv = cm_find_listen(cm_id->device, sidr_req_msg->service_id, sidr_req_msg->private_data);