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);