diff options
Diffstat (limited to 'drivers/net/typhoon.c')
-rw-r--r-- | drivers/net/typhoon.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c index e3ddcb8f29df..2fbf15235c05 100644 --- a/drivers/net/typhoon.c +++ b/drivers/net/typhoon.c | |||
@@ -2096,7 +2096,7 @@ typhoon_tx_timeout(struct net_device *dev) | |||
2096 | 2096 | ||
2097 | if(typhoon_reset(tp->ioaddr, WaitNoSleep) < 0) { | 2097 | if(typhoon_reset(tp->ioaddr, WaitNoSleep) < 0) { |
2098 | netdev_warn(dev, "could not reset in tx timeout\n"); | 2098 | netdev_warn(dev, "could not reset in tx timeout\n"); |
2099 | goto truely_dead; | 2099 | goto truly_dead; |
2100 | } | 2100 | } |
2101 | 2101 | ||
2102 | /* If we ever start using the Hi ring, it will need cleaning too */ | 2102 | /* If we ever start using the Hi ring, it will need cleaning too */ |
@@ -2105,13 +2105,13 @@ typhoon_tx_timeout(struct net_device *dev) | |||
2105 | 2105 | ||
2106 | if(typhoon_start_runtime(tp) < 0) { | 2106 | if(typhoon_start_runtime(tp) < 0) { |
2107 | netdev_err(dev, "could not start runtime in tx timeout\n"); | 2107 | netdev_err(dev, "could not start runtime in tx timeout\n"); |
2108 | goto truely_dead; | 2108 | goto truly_dead; |
2109 | } | 2109 | } |
2110 | 2110 | ||
2111 | netif_wake_queue(dev); | 2111 | netif_wake_queue(dev); |
2112 | return; | 2112 | return; |
2113 | 2113 | ||
2114 | truely_dead: | 2114 | truly_dead: |
2115 | /* Reset the hardware, and turn off carrier to avoid more timeouts */ | 2115 | /* Reset the hardware, and turn off carrier to avoid more timeouts */ |
2116 | typhoon_reset(tp->ioaddr, NoWait); | 2116 | typhoon_reset(tp->ioaddr, NoWait); |
2117 | netif_carrier_off(dev); | 2117 | netif_carrier_off(dev); |