diff options
Diffstat (limited to 'drivers/net/irda')
-rw-r--r-- | drivers/net/irda/au1k_ir.c | 4 | ||||
-rw-r--r-- | drivers/net/irda/sir_dev.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/irda/au1k_ir.c b/drivers/net/irda/au1k_ir.c index 269153eedd26..c4361d466597 100644 --- a/drivers/net/irda/au1k_ir.c +++ b/drivers/net/irda/au1k_ir.c | |||
@@ -512,13 +512,13 @@ static int au1k_irda_hard_xmit(struct sk_buff *skb, struct net_device *dev) | |||
512 | printk(KERN_DEBUG "%s: tx_full\n", dev->name); | 512 | printk(KERN_DEBUG "%s: tx_full\n", dev->name); |
513 | netif_stop_queue(dev); | 513 | netif_stop_queue(dev); |
514 | aup->tx_full = 1; | 514 | aup->tx_full = 1; |
515 | return 1; | 515 | return NETDEV_TX_BUSY; |
516 | } | 516 | } |
517 | else if (((aup->tx_head + 1) & (NUM_IR_DESC - 1)) == aup->tx_tail) { | 517 | else if (((aup->tx_head + 1) & (NUM_IR_DESC - 1)) == aup->tx_tail) { |
518 | printk(KERN_DEBUG "%s: tx_full\n", dev->name); | 518 | printk(KERN_DEBUG "%s: tx_full\n", dev->name); |
519 | netif_stop_queue(dev); | 519 | netif_stop_queue(dev); |
520 | aup->tx_full = 1; | 520 | aup->tx_full = 1; |
521 | return 1; | 521 | return NETDEV_TX_BUSY; |
522 | } | 522 | } |
523 | 523 | ||
524 | pDB = aup->tx_db_inuse[aup->tx_head]; | 524 | pDB = aup->tx_db_inuse[aup->tx_head]; |
diff --git a/drivers/net/irda/sir_dev.c b/drivers/net/irda/sir_dev.c index d940809762ec..fd0796c3db3c 100644 --- a/drivers/net/irda/sir_dev.c +++ b/drivers/net/irda/sir_dev.c | |||
@@ -607,7 +607,7 @@ static int sirdev_hard_xmit(struct sk_buff *skb, struct net_device *ndev) | |||
607 | * stopped so the network layer will retry after the | 607 | * stopped so the network layer will retry after the |
608 | * fsm completes and wakes the queue. | 608 | * fsm completes and wakes the queue. |
609 | */ | 609 | */ |
610 | return 1; | 610 | return NETDEV_TX_BUSY; |
611 | } | 611 | } |
612 | else if (unlikely(err)) { | 612 | else if (unlikely(err)) { |
613 | /* other fatal error - forget the speed change and | 613 | /* other fatal error - forget the speed change and |