[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>

diff --git a/drivers/infiniband/core/mad.c b/drivers/infiniband/core/mad.c
index 4ec7fff29b5d637f4549c379d222eeb7f0e9c0f8..9ed7d42b82a7ddc9ca3ad01cd57c85f314e87c36 100644 (file)
--- 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 4ba9f726bf1d834cb89c932c91d7d488e261b3b2..008cbcb94b15824591fe1878896fd85389bddb4e 100644 (file)
--- 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));