From: Richard Cochran <richardcochran@gmail.com>
Date: Sun, 19 Jun 2011 03:31:42 +0000 (+0000)
Subject: r6040: fix race in transmit time stamping.
X-Git-Tag: firefly_0821_release~3680^2~5008^2~419
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2aa8f4c9d0f88ae7eacac424d8816de225cfe2aa;p=firefly-linux-kernel-4.4.55.git

r6040: 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/r6040.c b/drivers/net/r6040.c
index 5ee5f8f932ff..00f06e9a7796 100644
--- a/drivers/net/r6040.c
+++ b/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;
 }