aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/typhoon.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c
index 39f1fc650be6..d1a80685e3a7 100644
--- a/drivers/net/typhoon.c
+++ b/drivers/net/typhoon.c
@@ -2113,7 +2113,7 @@ typhoon_tx_timeout(struct net_device *dev)
2113 if(typhoon_reset(tp->ioaddr, WaitNoSleep) < 0) { 2113 if(typhoon_reset(tp->ioaddr, WaitNoSleep) < 0) {
2114 printk(KERN_WARNING "%s: could not reset in tx timeout\n", 2114 printk(KERN_WARNING "%s: could not reset in tx timeout\n",
2115 dev->name); 2115 dev->name);
2116 goto truely_dead; 2116 goto truly_dead;
2117 } 2117 }
2118 2118
2119 /* If we ever start using the Hi ring, it will need cleaning too */ 2119 /* If we ever start using the Hi ring, it will need cleaning too */
@@ -2123,13 +2123,13 @@ typhoon_tx_timeout(struct net_device *dev)
2123 if(typhoon_start_runtime(tp) < 0) { 2123 if(typhoon_start_runtime(tp) < 0) {
2124 printk(KERN_ERR "%s: could not start runtime in tx timeout\n", 2124 printk(KERN_ERR "%s: could not start runtime in tx timeout\n",
2125 dev->name); 2125 dev->name);
2126 goto truely_dead; 2126 goto truly_dead;
2127 } 2127 }
2128 2128
2129 netif_wake_queue(dev); 2129 netif_wake_queue(dev);
2130 return; 2130 return;
2131 2131
2132truely_dead: 2132truly_dead:
2133 /* Reset the hardware, and turn off carrier to avoid more timeouts */ 2133 /* Reset the hardware, and turn off carrier to avoid more timeouts */
2134 typhoon_reset(tp->ioaddr, NoWait); 2134 typhoon_reset(tp->ioaddr, NoWait);
2135 netif_carrier_off(dev); 2135 netif_carrier_off(dev);