From 2639a91d9c2d2ad9e95f773632fa5a4c7d6c7a4f Mon Sep 17 00:00:00 2001
From: Jon Mason <jon.mason@intel.com>
Date: Sat, 19 Jan 2013 02:02:17 -0700
Subject: [PATCH] --- yaml --- r: 355024 b: refs/heads/master c:
 842c1ddea5f9949cb21e568408d2af9d986eee69 h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/ntb/ntb_transport.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 655d99631b21..68669ea8473b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8222b402e2df3b92948141046bae82fb774f3f64
+refs/heads/master: 842c1ddea5f9949cb21e568408d2af9d986eee69
diff --git a/trunk/drivers/ntb/ntb_transport.c b/trunk/drivers/ntb/ntb_transport.c
index 1d17857a2d97..e9666bd7ef41 100644
--- a/trunk/drivers/ntb/ntb_transport.c
+++ b/trunk/drivers/ntb/ntb_transport.c
@@ -1009,7 +1009,7 @@ static void ntb_tx_copy_task(struct ntb_transport_qp *qp,
 	hdr->ver = qp->tx_pkts;
 
 	/* Ensure that the data is fully copied out before setting the flag */
-	mmiowb();
+	wmb();
 	hdr->flags = entry->flags | DESC_DONE_FLAG;
 
 	ntb_ring_sdb(qp->ndev, qp->qp_num);