From: Richard Cochran Date: Sun, 19 Jun 2011 03:31:40 +0000 (+0000) Subject: fec: fix race in transmit time stamping. X-Git-Tag: MMI-PSA29.97-13-9~18929^2~421 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a0087a3619e1b137e7dbc91a1b2b5f15c0382412;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git fec: fix race in transmit time stamping. Signed-off-by: Richard Cochran Signed-off-by: David S. Miller --- diff --git a/drivers/net/fec.c b/drivers/net/fec.c index 965fe90e1c20..7ae3f2814200 100644 --- a/drivers/net/fec.c +++ b/drivers/net/fec.c @@ -324,10 +324,10 @@ fec_enet_start_xmit(struct sk_buff *skb, struct net_device *ndev) fep->cur_tx = bdp; - spin_unlock_irqrestore(&fep->hw_lock, flags); - skb_tx_timestamp(skb); + spin_unlock_irqrestore(&fep->hw_lock, flags); + return NETDEV_TX_OK; }