---

yaml --- r: 255596 b: refs/heads/master c: 2aa8f4c h: refs/heads/master v: v3
git-mirror · Jun 19, 2011 · 9f5a9bb · 9f5a9bb
1 parent f4e84a1
commit 9f5a9bb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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;
 }