From 1b4600de5ed8d6dc7056a431d1d00e59eca76eb4 Mon Sep 17 00:00:00 2001
From: Richard Cochran <richardcochran@gmail.com>
Date: Sun, 19 Jun 2011 03:31:45 +0000
Subject: [PATCH] --- yaml --- r: 255599 b: refs/heads/master c:
 5bf0c1913498e55f1bf4c56fef6dacf2feb049bb h: refs/heads/master i:   255597:
 3c97509c9613d6b86ffb413f1d507a22ed64dcd3   255595:
 f4e84a150a825973ebf84abe938b456149780142   255591:
 e5bb788bdd5c328e11f9450089710857e93362ae   255583:
 1f4a29d4e191b6d7b134fa15d46a18e24cf20a0e v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/net/davinci_emac.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 61db66cee9da..78fb3e288b07 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6241207253b940048ffb6ba483a248813261ce6a
+refs/heads/master: 5bf0c1913498e55f1bf4c56fef6dacf2feb049bb
diff --git a/trunk/drivers/net/davinci_emac.c b/trunk/drivers/net/davinci_emac.c
index f5688ff58a40..55c8245b0cdc 100644
--- a/trunk/drivers/net/davinci_emac.c
+++ b/trunk/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;