diff options
Diffstat (limited to 'drivers/net/de600.c')
-rw-r--r-- | drivers/net/de600.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/de600.c b/drivers/net/de600.c index c866ca99a068..e1af089064bc 100644 --- a/drivers/net/de600.c +++ b/drivers/net/de600.c | |||
@@ -168,14 +168,14 @@ static int de600_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
168 | if (free_tx_pages <= 0) { /* Do timeouts, to avoid hangs. */ | 168 | if (free_tx_pages <= 0) { /* Do timeouts, to avoid hangs. */ |
169 | tickssofar = jiffies - dev->trans_start; | 169 | tickssofar = jiffies - dev->trans_start; |
170 | if (tickssofar < 5) | 170 | if (tickssofar < 5) |
171 | return 1; | 171 | return NETDEV_TX_BUSY; |
172 | /* else */ | 172 | /* else */ |
173 | printk(KERN_WARNING "%s: transmit timed out (%d), %s?\n", dev->name, tickssofar, "network cable problem"); | 173 | printk(KERN_WARNING "%s: transmit timed out (%d), %s?\n", dev->name, tickssofar, "network cable problem"); |
174 | /* Restart the adapter. */ | 174 | /* Restart the adapter. */ |
175 | spin_lock_irqsave(&de600_lock, flags); | 175 | spin_lock_irqsave(&de600_lock, flags); |
176 | if (adapter_init(dev)) { | 176 | if (adapter_init(dev)) { |
177 | spin_unlock_irqrestore(&de600_lock, flags); | 177 | spin_unlock_irqrestore(&de600_lock, flags); |
178 | return 1; | 178 | return NETDEV_TX_BUSY; |
179 | } | 179 | } |
180 | spin_unlock_irqrestore(&de600_lock, flags); | 180 | spin_unlock_irqrestore(&de600_lock, flags); |
181 | } | 181 | } |
@@ -199,7 +199,7 @@ static int de600_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
199 | if (was_down || (de600_read_byte(READ_DATA, dev) != 0xde)) { | 199 | if (was_down || (de600_read_byte(READ_DATA, dev) != 0xde)) { |
200 | if (adapter_init(dev)) { | 200 | if (adapter_init(dev)) { |
201 | spin_unlock_irqrestore(&de600_lock, flags); | 201 | spin_unlock_irqrestore(&de600_lock, flags); |
202 | return 1; | 202 | return NETDEV_TX_BUSY; |
203 | } | 203 | } |
204 | } | 204 | } |
205 | } | 205 | } |