Skip to content

Commit

Permalink
davinci_emac: fix race in transmit time stamping.
Browse files Browse the repository at this point in the history
Signed-off-by: Richard Cochran <richard.cochran@omicron.at>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Richard Cochran authored and David S. Miller committed Jun 19, 2011
1 parent 6241207 commit 5bf0c19
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/net/davinci_emac.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit 5bf0c19

Please sign in to comment.