From: Richard Cochran <richardcochran@gmail.com>
Date: Sun, 19 Jun 2011 03:31:44 +0000 (+0000)
Subject: smsc9420: fix race in transmit time stamping.
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=6241207253b940048ffb6ba483a248813261ce6a;p=deliverable%2Flinux.git

smsc9420: fix race in transmit time stamping.

Signed-off-by: Richard Cochran <richard.cochran@omicron.at>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/smsc9420.c b/drivers/net/smsc9420.c
index 5555102bb964..459726f54754 100644
--- a/drivers/net/smsc9420.c
+++ b/drivers/net/smsc9420.c
@@ -1031,12 +1031,12 @@ static netdev_tx_t smsc9420_hard_start_xmit(struct sk_buff *skb,
 	pd->tx_ring[index].status = TDES0_OWN_;
 	wmb();
 
+	skb_tx_timestamp(skb);
+
 	/* kick the DMA */
 	smsc9420_reg_write(pd, TX_POLL_DEMAND, 1);
 	smsc9420_pci_flush_write(pd);
 
-	skb_tx_timestamp(skb);
-
 	return NETDEV_TX_OK;
 }