diff --git a/[refs] b/[refs] index e6016fe5a5f2..5fc6c2739d73 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1ca9495f851d6d41a118ae064002d51afdfd415b +refs/heads/master: 2669069aacc914821b45fe14a49e7fe0ba5d10bd diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c index c8a145d72f17..aa1d1defc820 100644 --- a/trunk/drivers/net/tg3.c +++ b/trunk/drivers/net/tg3.c @@ -6092,6 +6092,8 @@ static netdev_tx_t tg3_start_xmit(struct sk_buff *skb, struct net_device *dev) /* 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);