diff options
| author | Richard Cochran <richardcochran@gmail.com> | 2011-06-19 03:31:40 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-06-19 16:35:30 -0700 |
| commit | a0087a3619e1b137e7dbc91a1b2b5f15c0382412 (patch) | |
| tree | 838c4e512fc1a485d0ba0266e69550a2c080f66b /drivers/net/fec.c | |
| parent | 4ff75b7cf3b06efb72a50e26008d09b259b1231b (diff) | |
| download | op-kernel-dev-a0087a3619e1b137e7dbc91a1b2b5f15c0382412.zip op-kernel-dev-a0087a3619e1b137e7dbc91a1b2b5f15c0382412.tar.gz | |
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>
Diffstat (limited to 'drivers/net/fec.c')
| -rw-r--r-- | drivers/net/fec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/fec.c b/drivers/net/fec.c index 965fe90..7ae3f28 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; } |
