---

yaml --- r: 255599 b: refs/heads/master c: 5bf0c19 h: refs/heads/master i: 255597: 3c97509 255595: f4e84a1 255591: e5bb788 255583: 1f4a29d v: v3
git-mirror · Jun 19, 2011 · 1b4600d · 1b4600d
1 parent ec8aef2
commit 1b4600d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6241207253b940048ffb6ba483a248813261ce6a
+refs/heads/master: 5bf0c1913498e55f1bf4c56fef6dacf2feb049bb
diff --git a/trunk/drivers/net/davinci_emac.c b/trunk/drivers/net/davinci_emac.c
@@ -1083,14 +1083,15 @@ static int emac_dev_xmit(struct sk_buff *skb, struct net_device *ndev)
 		goto fail_tx;
 	}
 
+	skb_tx_timestamp(skb);
+
 	ret_code = cpdma_chan_submit(priv->txchan, skb, skb->data, skb->len,
 				     GFP_KERNEL);
 	if (unlikely(ret_code != 0)) {
 		if (netif_msg_tx_err(priv) && net_ratelimit())
 			dev_err(emac_dev, "DaVinci EMAC: desc submit failed");
 		goto fail_tx;
 	}
-	skb_tx_timestamp(skb);
 
 	return NETDEV_TX_OK;