From f4e84a150a825973ebf84abe938b456149780142 Mon Sep 17 00:00:00 2001
From: Richard Cochran <richardcochran@gmail.com>
Date: Sun, 19 Jun 2011 03:31:41 +0000
Subject: [PATCH] --- yaml --- r: 255595 b: refs/heads/master c:
 d515b450bfd50d355c5b3230685b997faeee5c49 h: refs/heads/master i:   255593:
 5d9d50a0c8c2195fdd327c55592766614bc6eceb   255591:
 e5bb788bdd5c328e11f9450089710857e93362ae v: v3

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

diff --git a/[refs] b/[refs]
index 6ac30ec01f50..046d68ea9834 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a0087a3619e1b137e7dbc91a1b2b5f15c0382412
+refs/heads/master: d515b450bfd50d355c5b3230685b997faeee5c49
diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c
index ca6687a94225..97cd02d08021 100644
--- a/trunk/drivers/net/tg3.c
+++ b/trunk/drivers/net/tg3.c
@@ -6119,11 +6119,11 @@ static netdev_tx_t tg3_start_xmit(struct sk_buff *skb, struct net_device *dev)
 		entry = NEXT_TX(tnapi->tx_prod);
 	}
 
+	skb_tx_timestamp(skb);
+
 	/* Packets are ready, update Tx producer idx local and on card. */
 	tw32_tx_mbox(tnapi->prodmbox, entry);
 
-	skb_tx_timestamp(skb);
-
 	tnapi->tx_prod = entry;
 	if (unlikely(tg3_tx_avail(tnapi) <= (MAX_SKB_FRAGS + 1))) {
 		netif_tx_stop_queue(txq);