summaryrefslogtreecommitdiff
path: root/drivers/net/de600.c
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2009-06-12 06:22:29 +0000
committerDavid S. Miller <davem@davemloft.net>2009-06-13 01:18:50 -0700
commit5b548140225c6bbbbd560551dd1048b2c0ce58be (patch)
tree9306a37dbca0095ca6d88e0b0ab297bcb2dc5ae8 /drivers/net/de600.c
parent5b2c4b972c0226406361f83b747eb5cdab51e68e (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.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/de600.c b/drivers/net/de600.c
index c866ca99a06..e1af089064b 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)
if (free_tx_pages <= 0) { /* Do timeouts, to avoid hangs. */
tickssofar = jiffies - dev->trans_start;
if (tickssofar < 5)
- return 1;
+ return NETDEV_TX_BUSY;
/* else */
printk(KERN_WARNING "%s: transmit timed out (%d), %s?\n", dev->name, tickssofar, "network cable problem");
/* Restart the adapter. */
spin_lock_irqsave(&de600_lock, flags);
if (adapter_init(dev)) {
spin_unlock_irqrestore(&de600_lock, flags);
- return 1;
+ return NETDEV_TX_BUSY;
}
spin_unlock_irqrestore(&de600_lock, flags);
}
@@ -199,7 +199,7 @@ static int de600_start_xmit(struct sk_buff *skb, struct net_device *dev)
if (was_down || (de600_read_byte(READ_DATA, dev) != 0xde)) {
if (adapter_init(dev)) {
spin_unlock_irqrestore(&de600_lock, flags);
- return 1;
+ return NETDEV_TX_BUSY;
}
}
}