diff options
author | Richard Cochran <richardcochran@gmail.com> | 2011-06-18 23:31:45 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-06-19 19:35:31 -0400 |
commit | 5bf0c1913498e55f1bf4c56fef6dacf2feb049bb (patch) | |
tree | fbd211157f3d72b371e8d76d65aea3c664579d97 /drivers/net/davinci_emac.c | |
parent | 6241207253b940048ffb6ba483a248813261ce6a (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.c | 3 |
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) | |||
1083 | goto fail_tx; | 1083 | goto fail_tx; |
1084 | } | 1084 | } |
1085 | 1085 | ||
1086 | skb_tx_timestamp(skb); | ||
1087 | |||
1086 | ret_code = cpdma_chan_submit(priv->txchan, skb, skb->data, skb->len, | 1088 | ret_code = cpdma_chan_submit(priv->txchan, skb, skb->data, skb->len, |
1087 | GFP_KERNEL); | 1089 | GFP_KERNEL); |
1088 | if (unlikely(ret_code != 0)) { | 1090 | if (unlikely(ret_code != 0)) { |
@@ -1090,7 +1092,6 @@ static int emac_dev_xmit(struct sk_buff *skb, struct net_device *ndev) | |||
1090 | dev_err(emac_dev, "DaVinci EMAC: desc submit failed"); | 1092 | dev_err(emac_dev, "DaVinci EMAC: desc submit failed"); |
1091 | goto fail_tx; | 1093 | goto fail_tx; |
1092 | } | 1094 | } |
1093 | skb_tx_timestamp(skb); | ||
1094 | 1095 | ||
1095 | return NETDEV_TX_OK; | 1096 | return NETDEV_TX_OK; |
1096 | 1097 | ||