diff options
Diffstat (limited to 'drivers/net/ni5010.c')
-rw-r--r-- | drivers/net/ni5010.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/ni5010.c b/drivers/net/ni5010.c index 3892330f244a..4d3f2e2b28bd 100644 --- a/drivers/net/ni5010.c +++ b/drivers/net/ni5010.c | |||
@@ -444,7 +444,7 @@ static void ni5010_timeout(struct net_device *dev) | |||
444 | /* Try to restart the adaptor. */ | 444 | /* Try to restart the adaptor. */ |
445 | /* FIXME: Give it a real kick here */ | 445 | /* FIXME: Give it a real kick here */ |
446 | chipset_init(dev, 1); | 446 | chipset_init(dev, 1); |
447 | dev->trans_start = jiffies; | 447 | dev->trans_start = jiffies; /* prevent tx timeout */ |
448 | netif_wake_queue(dev); | 448 | netif_wake_queue(dev); |
449 | } | 449 | } |
450 | 450 | ||
@@ -460,7 +460,6 @@ static int ni5010_send_packet(struct sk_buff *skb, struct net_device *dev) | |||
460 | 460 | ||
461 | netif_stop_queue(dev); | 461 | netif_stop_queue(dev); |
462 | 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); |
463 | dev->trans_start = jiffies; | ||
464 | dev_kfree_skb (skb); | 463 | dev_kfree_skb (skb); |
465 | return NETDEV_TX_OK; | 464 | return NETDEV_TX_OK; |
466 | } | 465 | } |
@@ -515,8 +514,6 @@ static void dump_packet(void *buf, int len) | |||
515 | if (i % 16 == 15) printk("\n"); | 514 | if (i % 16 == 15) printk("\n"); |
516 | } | 515 | } |
517 | printk("\n"); | 516 | printk("\n"); |
518 | |||
519 | return; | ||
520 | } | 517 | } |
521 | 518 | ||
522 | /* We have a good packet, get it out of the buffer. */ | 519 | /* We have a good packet, get it out of the buffer. */ |