aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/tg3.c
diff options
context:
space:
mode:
authorRichard Cochran <richardcochran@gmail.com>2011-06-19 03:31:41 +0000
committerDavid S. Miller <davem@davemloft.net>2011-06-19 16:35:30 -0700
commitd515b450bfd50d355c5b3230685b997faeee5c49 (patch)
treefed30520df49726b8f0306ec0e54b1d80d29d6d7 /drivers/net/tg3.c
parentfec: fix race in transmit time stamping. (diff)
downloadlinux-dev-d515b450bfd50d355c5b3230685b997faeee5c49.tar.xz
linux-dev-d515b450bfd50d355c5b3230685b997faeee5c49.zip
tg3: fix race in transmit time stamping.
Signed-off-by: Richard Cochran <richard.cochran@omicron.at> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/tg3.c')
-rw-r--r--drivers/net/tg3.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index ca6687a94225..97cd02d08021 100644
--- a/drivers/net/tg3.c
+++ b/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);