From 3c97509c9613d6b86ffb413f1d507a22ed64dcd3 Mon Sep 17 00:00:00 2001 From: Richard Cochran Date: Sun, 19 Jun 2011 03:31:43 +0000 Subject: [PATCH] --- yaml --- r: 255597 b: refs/heads/master c: 52f64faeb0fdcd49f14586beab83eabc9170b6a1 h: refs/heads/master i: 255595: f4e84a150a825973ebf84abe938b456149780142 v: v3 --- [refs] | 2 +- trunk/drivers/net/stmmac/stmmac_main.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7fc336009c4c..d659ec7c508f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2aa8f4c9d0f88ae7eacac424d8816de225cfe2aa +refs/heads/master: 52f64faeb0fdcd49f14586beab83eabc9170b6a1 diff --git a/trunk/drivers/net/stmmac/stmmac_main.c b/trunk/drivers/net/stmmac/stmmac_main.c index 5b85f4ca2004..d4adc806f6f8 100644 --- a/trunk/drivers/net/stmmac/stmmac_main.c +++ b/trunk/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; }