aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/au1000_eth.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/au1000_eth.c')
-rw-r--r--drivers/net/au1000_eth.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/au1000_eth.c b/drivers/net/au1000_eth.c
index 7abb2c84ba5d..ece6128bef14 100644
--- a/drivers/net/au1000_eth.c
+++ b/drivers/net/au1000_eth.c
@@ -924,7 +924,6 @@ static netdev_tx_t au1000_tx(struct sk_buff *skb, struct net_device *dev)
924 au_sync(); 924 au_sync();
925 dev_kfree_skb(skb); 925 dev_kfree_skb(skb);
926 aup->tx_head = (aup->tx_head + 1) & (NUM_TX_DMA - 1); 926 aup->tx_head = (aup->tx_head + 1) & (NUM_TX_DMA - 1);
927 dev->trans_start = jiffies;
928 return NETDEV_TX_OK; 927 return NETDEV_TX_OK;
929} 928}
930 929
@@ -937,7 +936,7 @@ static void au1000_tx_timeout(struct net_device *dev)
937 netdev_err(dev, "au1000_tx_timeout: dev=%p\n", dev); 936 netdev_err(dev, "au1000_tx_timeout: dev=%p\n", dev);
938 au1000_reset_mac(dev); 937 au1000_reset_mac(dev);
939 au1000_init(dev); 938 au1000_init(dev);
940 dev->trans_start = jiffies; 939 dev->trans_start = jiffies; /* prevent tx timeout */
941 netif_wake_queue(dev); 940 netif_wake_queue(dev);
942} 941}
943 942