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/hamradio/mkiss.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/hamradio/mkiss.c')
-rw-r--r-- | drivers/net/hamradio/mkiss.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/hamradio/mkiss.c b/drivers/net/hamradio/mkiss.c index 032c0db4c410..fda2fc83e9a1 100644 --- a/drivers/net/hamradio/mkiss.c +++ b/drivers/net/hamradio/mkiss.c | |||
@@ -531,7 +531,7 @@ static int ax_xmit(struct sk_buff *skb, struct net_device *dev) | |||
531 | 531 | ||
532 | if (!netif_running(dev)) { | 532 | if (!netif_running(dev)) { |
533 | printk(KERN_ERR "mkiss: %s: xmit call when iface is down\n", dev->name); | 533 | printk(KERN_ERR "mkiss: %s: xmit call when iface is down\n", dev->name); |
534 | return 1; | 534 | return NETDEV_TX_BUSY; |
535 | } | 535 | } |
536 | 536 | ||
537 | if (netif_queue_stopped(dev)) { | 537 | if (netif_queue_stopped(dev)) { |
@@ -541,7 +541,7 @@ static int ax_xmit(struct sk_buff *skb, struct net_device *dev) | |||
541 | */ | 541 | */ |
542 | if (time_before(jiffies, dev->trans_start + 20 * HZ)) { | 542 | if (time_before(jiffies, dev->trans_start + 20 * HZ)) { |
543 | /* 20 sec timeout not reached */ | 543 | /* 20 sec timeout not reached */ |
544 | return 1; | 544 | return NETDEV_TX_BUSY; |
545 | } | 545 | } |
546 | 546 | ||
547 | printk(KERN_ERR "mkiss: %s: transmit timed out, %s?\n", dev->name, | 547 | printk(KERN_ERR "mkiss: %s: transmit timed out, %s?\n", dev->name, |