summaryrefslogtreecommitdiff
path: root/drivers/infiniband
diff options
context:
space:
mode:
authorSean Hefty <sean.hefty@intel.com>2005-04-17 02:26:08 +0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-17 02:26:08 +0400
commit24239aff4e25cba2d068b2c6b8e739257351c15d (patch)
tree3c2946978bf4a13687030e11944b1cefb2f5c442 /drivers/infiniband
parentb1ed8dab9486ecc109b74d3941051155cb07a05a (diff)
downloadlinux-24239aff4e25cba2d068b2c6b8e739257351c15d.tar.xz
[PATCH] IB: Keep MAD work completion valid
Replace the *wc field in ib_mad_recv_wc from pointing to a structure on the stack to one allocated with the received MAD buffer. This allows a client to access the *wc field after their receive completion handler has returned. Signed-off-by: Sean Hefty <sean.hefty@intel.com> Signed-off-by: Roland Dreier <roland@topspin.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.c3
-rw-r--r--drivers/infiniband/core/mad_priv.h1
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/infiniband/core/mad.c b/drivers/infiniband/core/mad.c
index 4ec7fff29b5d..9ed7d42b82a7 100644
--- a/drivers/infiniband/core/mad.c
+++ b/drivers/infiniband/core/mad.c
@@ -1600,7 +1600,8 @@ static void ib_mad_recv_done_handler(struct ib_mad_port_private *port_priv,
DMA_FROM_DEVICE);
/* Setup MAD receive work completion from "normal" work completion */
- recv->header.recv_wc.wc = wc;
+ recv->header.wc = *wc;
+ recv->header.recv_wc.wc = &recv->header.wc;
recv->header.recv_wc.mad_len = sizeof(struct ib_mad);
recv->header.recv_wc.recv_buf.mad = &recv->mad.mad;
recv->header.recv_wc.recv_buf.grh = &recv->grh;
diff --git a/drivers/infiniband/core/mad_priv.h b/drivers/infiniband/core/mad_priv.h
index 4ba9f726bf1d..008cbcb94b15 100644
--- a/drivers/infiniband/core/mad_priv.h
+++ b/drivers/infiniband/core/mad_priv.h
@@ -69,6 +69,7 @@ struct ib_mad_list_head {
struct ib_mad_private_header {
struct ib_mad_list_head mad_list;
struct ib_mad_recv_wc recv_wc;
+ struct ib_wc wc;
DECLARE_PCI_UNMAP_ADDR(mapping)
} __attribute__ ((packed));