aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ni5010.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/ni5010.c')
-rw-r--r--drivers/net/ni5010.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/ni5010.c b/drivers/net/ni5010.c
index c16cbfb4061b..f80b50159114 100644
--- a/drivers/net/ni5010.c
+++ b/drivers/net/ni5010.c
@@ -51,7 +51,6 @@
51#include <linux/string.h> 51#include <linux/string.h>
52#include <linux/errno.h> 52#include <linux/errno.h>
53#include <linux/ioport.h> 53#include <linux/ioport.h>
54#include <linux/slab.h>
55#include <linux/interrupt.h> 54#include <linux/interrupt.h>
56#include <linux/delay.h> 55#include <linux/delay.h>
57#include <linux/init.h> 56#include <linux/init.h>
@@ -445,7 +444,7 @@ static void ni5010_timeout(struct net_device *dev)
445 /* Try to restart the adaptor. */ 444 /* Try to restart the adaptor. */
446 /* FIXME: Give it a real kick here */ 445 /* FIXME: Give it a real kick here */
447 chipset_init(dev, 1); 446 chipset_init(dev, 1);
448 dev->trans_start = jiffies; 447 dev->trans_start = jiffies; /* prevent tx timeout */
449 netif_wake_queue(dev); 448 netif_wake_queue(dev);
450} 449}
451 450
@@ -461,7 +460,6 @@ static int ni5010_send_packet(struct sk_buff *skb, struct net_device *dev)
461 460
462 netif_stop_queue(dev); 461 netif_stop_queue(dev);
463 hardware_send_packet(dev, (unsigned char *)skb->data, skb->len, length-skb->len); 462 hardware_send_packet(dev, (unsigned char *)skb->data, skb->len, length-skb->len);
464 dev->trans_start = jiffies;
465 dev_kfree_skb (skb); 463 dev_kfree_skb (skb);
466 return NETDEV_TX_OK; 464 return NETDEV_TX_OK;
467} 465}