diff options
author | Richard Cochran <richardcochran@gmail.com> | 2011-06-18 23:31:44 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-06-19 19:35:31 -0400 |
commit | 6241207253b940048ffb6ba483a248813261ce6a (patch) | |
tree | 88f2ce417c8f52215b92e6516486b986881193a3 /drivers/net/smsc9420.c | |
parent | 52f64faeb0fdcd49f14586beab83eabc9170b6a1 (diff) |
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, | |||
1031 | pd->tx_ring[index].status = TDES0_OWN_; | 1031 | pd->tx_ring[index].status = TDES0_OWN_; |
1032 | wmb(); | 1032 | wmb(); |
1033 | 1033 | ||
1034 | skb_tx_timestamp(skb); | ||
1035 | |||
1034 | /* kick the DMA */ | 1036 | /* kick the DMA */ |
1035 | smsc9420_reg_write(pd, TX_POLL_DEMAND, 1); | 1037 | smsc9420_reg_write(pd, TX_POLL_DEMAND, 1); |
1036 | smsc9420_pci_flush_write(pd); | 1038 | smsc9420_pci_flush_write(pd); |
1037 | 1039 | ||
1038 | skb_tx_timestamp(skb); | ||
1039 | |||
1040 | return NETDEV_TX_OK; | 1040 | return NETDEV_TX_OK; |
1041 | } | 1041 | } |
1042 | 1042 | ||