diff options
| author | Richard Cochran <richardcochran@gmail.com> | 2011-06-19 03:31:43 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-06-19 16:35:30 -0700 |
| commit | 52f64faeb0fdcd49f14586beab83eabc9170b6a1 (patch) | |
| tree | 0a41525e10938b2db8a65cb66471a16dfa7eaa85 /drivers/net | |
| parent | 2aa8f4c9d0f88ae7eacac424d8816de225cfe2aa (diff) | |
| download | talos-obmc-linux-52f64faeb0fdcd49f14586beab83eabc9170b6a1.tar.gz talos-obmc-linux-52f64faeb0fdcd49f14586beab83eabc9170b6a1.zip | |
stmmac: 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')
| -rw-r--r-- | drivers/net/stmmac/stmmac_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/stmmac/stmmac_main.c b/drivers/net/stmmac/stmmac_main.c index 5b85f4ca2004..d4adc806f6f8 100644 --- a/drivers/net/stmmac/stmmac_main.c +++ b/drivers/net/stmmac/stmmac_main.c @@ -1079,10 +1079,10 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev) dev->stats.tx_bytes += skb->len; - priv->hw->dma->enable_dma_transmission(priv->ioaddr); - skb_tx_timestamp(skb); + priv->hw->dma->enable_dma_transmission(priv->ioaddr); + return NETDEV_TX_OK; } |
