diff options
author | Patrick McHardy <kaber@trash.net> | 2009-06-12 02:22:29 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-06-13 04:18:50 -0400 |
commit | 5b548140225c6bbbbd560551dd1048b2c0ce58be (patch) | |
tree | 9306a37dbca0095ca6d88e0b0ab297bcb2dc5ae8 /drivers/net/de600.c | |
parent | 5b2c4b972c0226406361f83b747eb5cdab51e68e (diff) |
net: use symbolic values for ndo_start_xmit() return codes
Convert magic values 1 and -1 to NETDEV_TX_BUSY and NETDEV_TX_LOCKED respectively.
0 (NETDEV_TX_OK) is not changed to keep the noise down, except in very few cases
where its in direct proximity to one of the other values.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
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 | } |