diff options
author | Sean Hefty <sean.hefty@intel.com> | 2007-07-02 17:36:19 -0400 |
---|---|---|
committer | Roland Dreier <rolandd@cisco.com> | 2007-07-11 00:51:43 -0400 |
commit | 29c2731cbfa9d5b560a73461775f2be03b46dd4c (patch) | |
tree | c2f4edc90572fe3e782f54f4fc0c43171f657668 /drivers/infiniband | |
parent | 5d861be8c87b8a8f8e0f58b3b8864f31da7ee9c3 (diff) |
IB/cm: Fix handling of duplicate SIDR REQs
Fix handling to duplicate SIDR REQs to avoid sending a reject if a
duplicate is detected. Duplicates should just be silently discarded.
Signed-off-by: Sean Hefty <sean.hefty@intel.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
Diffstat (limited to 'drivers/infiniband')
-rw-r--r-- | drivers/infiniband/core/cm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c index c7007c45889a..9135a8c1d4ac 100644 --- a/drivers/infiniband/core/cm.c +++ b/drivers/infiniband/core/cm.c | |||
@@ -2794,7 +2794,6 @@ static int cm_sidr_req_handler(struct cm_work *work) | |||
2794 | work->mad_recv_wc->recv_buf.grh, | 2794 | work->mad_recv_wc->recv_buf.grh, |
2795 | &cm_id_priv->av); | 2795 | &cm_id_priv->av); |
2796 | cm_id_priv->id.remote_id = sidr_req_msg->request_id; | 2796 | cm_id_priv->id.remote_id = sidr_req_msg->request_id; |
2797 | cm_id_priv->id.state = IB_CM_SIDR_REQ_RCVD; | ||
2798 | cm_id_priv->tid = sidr_req_msg->hdr.tid; | 2797 | cm_id_priv->tid = sidr_req_msg->hdr.tid; |
2799 | atomic_inc(&cm_id_priv->work_count); | 2798 | atomic_inc(&cm_id_priv->work_count); |
2800 | 2799 | ||
@@ -2804,6 +2803,7 @@ static int cm_sidr_req_handler(struct cm_work *work) | |||
2804 | spin_unlock_irq(&cm.lock); | 2803 | spin_unlock_irq(&cm.lock); |
2805 | goto out; /* Duplicate message. */ | 2804 | goto out; /* Duplicate message. */ |
2806 | } | 2805 | } |
2806 | cm_id_priv->id.state = IB_CM_SIDR_REQ_RCVD; | ||
2807 | cur_cm_id_priv = cm_find_listen(cm_id->device, | 2807 | cur_cm_id_priv = cm_find_listen(cm_id->device, |
2808 | sidr_req_msg->service_id, | 2808 | sidr_req_msg->service_id, |
2809 | sidr_req_msg->private_data); | 2809 | sidr_req_msg->private_data); |