summaryrefslogtreecommitdiffstats
path: root/drivers/infiniband
diff options
context:
space:
mode:
authorHal Rosenstock <halr@voltaire.com>2005-07-27 11:45:24 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-27 16:26:10 -0700
commitf8197a4ed1bba8c80ed6ddf4535ded80cb4152cf (patch)
tree0f3bcc7445938c3ff0f5f9e241faa08dafe90ea9 /drivers/infiniband
parent4a0754fae8fb5162d1cf4f738d48bb1e8190c09f (diff)
downloadblackbird-op-linux-f8197a4ed1bba8c80ed6ddf4535ded80cb4152cf.tar.gz
blackbird-op-linux-f8197a4ed1bba8c80ed6ddf4535ded80cb4152cf.zip
[PATCH] IB: Change saving of user's send wr_id in MAD
Move saving of user's send wr_id to better match layering of received response handling. Signed-off-by: Sean Hefty <sean.hefty@intel.com> Signed-off-by: Hal Rosenstock <halr@voltaire.com> Cc: Roland Dreier <rolandd@cisco.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/infiniband')
-rw-r--r--drivers/infiniband/core/mad.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/infiniband/core/mad.c b/drivers/infiniband/core/mad.c
index ebe8c3a45410..5535a45a8548 100644
--- a/drivers/infiniband/core/mad.c
+++ b/drivers/infiniband/core/mad.c
@@ -847,9 +847,8 @@ static int ib_send_mad(struct ib_mad_agent_private *mad_agent_priv,
unsigned long flags;
int ret;
- /* Replace user's WR ID with our own to find WR upon completion */
+ /* Set WR ID to find mad_send_wr upon completion */
qp_info = mad_agent_priv->qp_info;
- mad_send_wr->wr_id = mad_send_wr->send_wr.wr_id;
mad_send_wr->send_wr.wr_id = (unsigned long)&mad_send_wr->mad_list;
mad_send_wr->mad_list.mad_queue = &qp_info->send_queue;
@@ -948,6 +947,7 @@ int ib_post_send_mad(struct ib_mad_agent *mad_agent,
mad_send_wr->send_wr.sg_list = mad_send_wr->sg_list;
memcpy(mad_send_wr->sg_list, send_wr->sg_list,
sizeof *send_wr->sg_list * send_wr->num_sge);
+ mad_send_wr->wr_id = mad_send_wr->send_wr.wr_id;
mad_send_wr->send_wr.next = NULL;
mad_send_wr->tid = send_wr->wr.ud.mad_hdr->tid;
mad_send_wr->agent = mad_agent;
OpenPOWER on IntegriCloud