From 74338ad4faf298955879b0773db5a54e79180d81 Mon Sep 17 00:00:00 2001
From: Sean Hefty <sean.hefty@intel.com>
Date: Sat, 16 Apr 2005 15:26:08 -0700
Subject: [PATCH] --- yaml --- r: 158 b: refs/heads/master c:
 24239aff4e25cba2d068b2c6b8e739257351c15d h: refs/heads/master v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/infiniband/core/mad.c      | 3 ++-
 trunk/drivers/infiniband/core/mad_priv.h | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 4ca98956f5a2..5f5fc5e59e67 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b1ed8dab9486ecc109b74d3941051155cb07a05a
+refs/heads/master: 24239aff4e25cba2d068b2c6b8e739257351c15d
diff --git a/trunk/drivers/infiniband/core/mad.c b/trunk/drivers/infiniband/core/mad.c
index 4ec7fff29b5d..9ed7d42b82a7 100644
--- a/trunk/drivers/infiniband/core/mad.c
+++ b/trunk/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/trunk/drivers/infiniband/core/mad_priv.h b/trunk/drivers/infiniband/core/mad_priv.h
index 4ba9f726bf1d..008cbcb94b15 100644
--- a/trunk/drivers/infiniband/core/mad_priv.h
+++ b/trunk/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));