summaryrefslogtreecommitdiff
path: root/drivers/net/davinci_emac.c
diff options
context:
space:
mode:
authorRichard Cochran <richardcochran@gmail.com>2011-06-19 03:31:45 +0000
committerDavid S. Miller <davem@davemloft.net>2011-06-19 16:35:31 -0700
commit5bf0c1913498e55f1bf4c56fef6dacf2feb049bb (patch)
treefbd211157f3d72b371e8d76d65aea3c664579d97 /drivers/net/davinci_emac.c
parent6241207253b940048ffb6ba483a248813261ce6a (diff)
davinci_emac: 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/davinci_emac.c')
-rw-r--r--drivers/net/davinci_emac.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c
index f5688ff58a40..55c8245b0cdc 100644
--- a/drivers/net/davinci_emac.c
+++ b/drivers/net/davinci_emac.c
@@ -1083,6 +1083,8 @@ 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)) {
@@ -1090,7 +1092,6 @@ static int emac_dev_xmit(struct sk_buff *skb, struct net_device *ndev)
dev_err(emac_dev, "DaVinci EMAC: desc submit failed");
goto fail_tx;
}
- skb_tx_timestamp(skb);
return NETDEV_TX_OK;