summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Cochran <richardcochran@gmail.com>2011-06-19 07:31:40 +0400
committerDavid S. Miller <davem@davemloft.net>2011-06-20 03:35:30 +0400
commita0087a3619e1b137e7dbc91a1b2b5f15c0382412 (patch)
tree838c4e512fc1a485d0ba0266e69550a2c080f66b
parent4ff75b7cf3b06efb72a50e26008d09b259b1231b (diff)
downloadlinux-a0087a3619e1b137e7dbc91a1b2b5f15c0382412.tar.xz
fec: 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/fec.c4
1 files changed, 2 insertions, 2 deletions
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;
}