diff options
| author | Richard Cochran <richardcochran@gmail.com> | 2011-06-19 05:31:44 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-06-20 01:35:31 +0200 |
| commit | 6241207253b940048ffb6ba483a248813261ce6a (patch) | |
| tree | 88f2ce417c8f52215b92e6516486b986881193a3 /drivers/net/smsc9420.c | |
| parent | stmmac: fix race in transmit time stamping. (diff) | |
| download | linux-6241207253b940048ffb6ba483a248813261ce6a.tar.xz linux-6241207253b940048ffb6ba483a248813261ce6a.zip | |
smsc9420: 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/smsc9420.c')
| -rw-r--r-- | drivers/net/smsc9420.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/smsc9420.c b/drivers/net/smsc9420.c index 5555102bb964..459726f54754 100644 --- a/drivers/net/smsc9420.c +++ b/drivers/net/smsc9420.c @@ -1031,12 +1031,12 @@ static netdev_tx_t smsc9420_hard_start_xmit(struct sk_buff *skb, pd->tx_ring[index].status = TDES0_OWN_; wmb(); + skb_tx_timestamp(skb); + /* kick the DMA */ smsc9420_reg_write(pd, TX_POLL_DEMAND, 1); smsc9420_pci_flush_write(pd); - skb_tx_timestamp(skb); - return NETDEV_TX_OK; } |