From 9f5a9bb2e3b3476458c5a02b064a0e8702f7ff34 Mon Sep 17 00:00:00 2001
From: Richard Cochran <richardcochran@gmail.com>
Date: Sun, 19 Jun 2011 03:31:42 +0000
Subject: [PATCH] --- yaml --- r: 255596 b: refs/heads/master c:
 2aa8f4c9d0f88ae7eacac424d8816de225cfe2aa h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 046d68ea9834..7fc336009c4c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d515b450bfd50d355c5b3230685b997faeee5c49
+refs/heads/master: 2aa8f4c9d0f88ae7eacac424d8816de225cfe2aa
diff --git a/trunk/drivers/net/r6040.c b/trunk/drivers/net/r6040.c
index 5ee5f8f932ff..00f06e9a7796 100644
--- a/trunk/drivers/net/r6040.c
+++ b/trunk/drivers/net/r6040.c
@@ -836,6 +836,9 @@ static netdev_tx_t r6040_start_xmit(struct sk_buff *skb,
 	descptr->buf = cpu_to_le32(pci_map_single(lp->pdev,
 		skb->data, skb->len, PCI_DMA_TODEVICE));
 	descptr->status = DSC_OWNER_MAC;
+
+	skb_tx_timestamp(skb);
+
 	/* Trigger the MAC to check the TX descriptor */
 	iowrite16(0x01, ioaddr + MTPR);
 	lp->tx_insert_ptr = descptr->vndescp;
@@ -846,8 +849,6 @@ static netdev_tx_t r6040_start_xmit(struct sk_buff *skb,
 
 	spin_unlock_irqrestore(&lp->lock, flags);
 
-	skb_tx_timestamp(skb);
-
 	return NETDEV_TX_OK;
 }