diff options
| author | Richard Cochran <richardcochran@gmail.com> | 2011-06-19 03:31:45 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-06-19 16:35:31 -0700 |
| commit | 5bf0c1913498e55f1bf4c56fef6dacf2feb049bb (patch) | |
| tree | fbd211157f3d72b371e8d76d65aea3c664579d97 | |
| parent | 6241207253b940048ffb6ba483a248813261ce6a (diff) | |
| download | lwn-5bf0c1913498e55f1bf4c56fef6dacf2feb049bb.tar.gz lwn-5bf0c1913498e55f1bf4c56fef6dacf2feb049bb.zip | |
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>
| -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) 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; |