diff options
Diffstat (limited to 'drivers/net/seeq8005.c')
-rw-r--r-- | drivers/net/seeq8005.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/seeq8005.c b/drivers/net/seeq8005.c index 374832cca11f..d2fce98f557f 100644 --- a/drivers/net/seeq8005.c +++ b/drivers/net/seeq8005.c | |||
@@ -390,7 +390,7 @@ static void seeq8005_timeout(struct net_device *dev) | |||
390 | tx_done(dev) ? "IRQ conflict" : "network cable problem"); | 390 | tx_done(dev) ? "IRQ conflict" : "network cable problem"); |
391 | /* Try to restart the adaptor. */ | 391 | /* Try to restart the adaptor. */ |
392 | seeq8005_init(dev, 1); | 392 | seeq8005_init(dev, 1); |
393 | dev->trans_start = jiffies; | 393 | dev->trans_start = jiffies; /* prevent tx timeout */ |
394 | netif_wake_queue(dev); | 394 | netif_wake_queue(dev); |
395 | } | 395 | } |
396 | 396 | ||
@@ -411,7 +411,6 @@ static netdev_tx_t seeq8005_send_packet(struct sk_buff *skb, | |||
411 | netif_stop_queue(dev); | 411 | netif_stop_queue(dev); |
412 | 412 | ||
413 | hardware_send_packet(dev, buf, length); | 413 | hardware_send_packet(dev, buf, length); |
414 | dev->trans_start = jiffies; | ||
415 | dev->stats.tx_bytes += length; | 414 | dev->stats.tx_bytes += length; |
416 | dev_kfree_skb (skb); | 415 | dev_kfree_skb (skb); |
417 | /* You might need to clean up and record Tx statistics here. */ | 416 | /* You might need to clean up and record Tx statistics here. */ |
@@ -579,7 +578,6 @@ static void seeq8005_rx(struct net_device *dev) | |||
579 | /* If any worth-while packets have been received, netif_rx() | 578 | /* If any worth-while packets have been received, netif_rx() |
580 | has done a mark_bh(NET_BH) for us and will work on them | 579 | has done a mark_bh(NET_BH) for us and will work on them |
581 | when we get to the bottom-half routine. */ | 580 | when we get to the bottom-half routine. */ |
582 | return; | ||
583 | } | 581 | } |
584 | 582 | ||
585 | /* The inverse routine to net_open(). */ | 583 | /* The inverse routine to net_open(). */ |