diff options
Diffstat (limited to 'drivers/net/tokenring/smctr.c')
-rw-r--r-- | drivers/net/tokenring/smctr.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/tokenring/smctr.c b/drivers/net/tokenring/smctr.c index e40560137c46..0929fff5982c 100644 --- a/drivers/net/tokenring/smctr.c +++ b/drivers/net/tokenring/smctr.c | |||
@@ -4562,7 +4562,7 @@ static void smctr_timeout(struct net_device *dev) | |||
4562 | * fake transmission time and go on trying. Our own timeout | 4562 | * fake transmission time and go on trying. Our own timeout |
4563 | * routine is in sktr_timer_chk() | 4563 | * routine is in sktr_timer_chk() |
4564 | */ | 4564 | */ |
4565 | dev->trans_start = jiffies; | 4565 | dev->trans_start = jiffies; /* prevent tx timeout */ |
4566 | netif_wake_queue(dev); | 4566 | netif_wake_queue(dev); |
4567 | } | 4567 | } |
4568 | 4568 | ||
@@ -5147,8 +5147,6 @@ static void smctr_set_multicast_list(struct net_device *dev) | |||
5147 | { | 5147 | { |
5148 | if(smctr_debug > 10) | 5148 | if(smctr_debug > 10) |
5149 | printk(KERN_DEBUG "%s: smctr_set_multicast_list\n", dev->name); | 5149 | printk(KERN_DEBUG "%s: smctr_set_multicast_list\n", dev->name); |
5150 | |||
5151 | return; | ||
5152 | } | 5150 | } |
5153 | 5151 | ||
5154 | static int smctr_set_page(struct net_device *dev, __u8 *buf) | 5152 | static int smctr_set_page(struct net_device *dev, __u8 *buf) |