---

yaml --- r: 112199 b: refs/heads/master c: 176eaa5 h: refs/heads/master i: 112197: ca12ef0 112195: 8f88b32 112191: 18889ac v: v3
git-mirror · Oct 9, 2008 · 3d6a44b · 3d6a44b
1 parent 772f342
commit 3d6a44b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ed4cb1337b7c23b91a0f01f661c3f004fc3d3c1a
+refs/heads/master: 176eaa589b3d242f25f24e472883fcce5f196777
diff --git a/trunk/drivers/net/8139too.c b/trunk/drivers/net/8139too.c
@@ -1723,13 +1723,18 @@ static int rtl8139_start_xmit (struct sk_buff *skb, struct net_device *dev)
 	}
 
 	spin_lock_irqsave(&tp->lock, flags);
+	/*
+	 * Writing to TxStatus triggers a DMA transfer of the data
+	 * copied to tp->tx_buf[entry] above. Use a memory barrier
+	 * to make sure that the device sees the updated data.
+	 */
+	wmb();
 	RTL_W32_F (TxStatus0 + (entry * sizeof (u32)),
 		   tp->tx_flag | max(len, (unsigned int)ETH_ZLEN));
 
 	dev->trans_start = jiffies;
 
 	tp->cur_tx++;
-	wmb();
 
 	if ((tp->cur_tx - NUM_TX_DESC) == tp->dirty_tx)
 		netif_stop_queue (dev);