From: Richard Cochran <richardcochran@gmail.com>
Date: Sun, 19 Jun 2011 03:31:45 +0000 (+0000)
Subject: davinci_emac: fix race in transmit time stamping.
X-Git-Tag: MMI-PSA29.97-13-9~18929^2~416
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5bf0c1913498e55f1bf4c56fef6dacf2feb049bb;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

davinci_emac: 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/davinci_emac.c b/drivers/net/davinci_emac.c
index f5688ff58a40..55c8245b0cdc 100644
--- a/drivers/net/davinci_emac.c
+++ b/drivers/net/davinci_emac.c
@@ -1083,6 +1083,8 @@ static int emac_dev_xmit(struct sk_buff *skb, struct net_device *ndev)
 		goto fail_tx;
 	}
 
+	skb_tx_timestamp(skb);
+
 	ret_code = cpdma_chan_submit(priv->txchan, skb, skb->data, skb->len,
 				     GFP_KERNEL);
 	if (unlikely(ret_code != 0)) {
@@ -1090,7 +1092,6 @@ static int emac_dev_xmit(struct sk_buff *skb, struct net_device *ndev)
 			dev_err(emac_dev, "DaVinci EMAC: desc submit failed");
 		goto fail_tx;
 	}
-	skb_tx_timestamp(skb);
 
 	return NETDEV_TX_OK;