evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

davinci_emac: fix race in transmit time stamping.

Browse source 
Signed-off-by: Richard Cochran <richard.cochran@omicron.at>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Richard Cochran 2011-06-19 03:31:45 +00:00 • committed by David S. Miller
parent 6241207253
commit 5bf0c19134
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/net/davinci_emac.c
View file

@ -1083,6 +1083,8 @@ static int emac_dev_xmit(struct sk_buff *skb, struct net_device *ndev)
goto fail_tx; goto fail_tx;
} }
skb_tx_timestamp(skb);
ret_code = cpdma_chan_submit(priv->txchan, skb, skb->data, skb->len, ret_code = cpdma_chan_submit(priv->txchan, skb, skb->data, skb->len,
GFP_KERNEL); GFP_KERNEL);
if (unlikely(ret_code != 0)) { 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"); dev_err(emac_dev, "DaVinci EMAC: desc submit failed");
goto fail_tx; goto fail_tx;
} }
skb_tx_timestamp(skb);
return NETDEV_TX_OK; return NETDEV_TX_OK;