aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2009-06-12 00:37:34 -0400
committerDavid S. Miller <davem@davemloft.net>2009-06-13 04:18:39 -0400
commit47f88c99c2ad0c05dd415e1c2a6d59426eb305ed (patch)
tree18ae02686efdbbd5c89eb62211bbf82f797b81de /drivers/net
parent4153e77596c4caaf52293b0c6b2207d73ed8f1eb (diff)
net: fix network drivers ndo_start_xmit() return values (part 4)
Fix up WAN drivers that return an errno value to qdisc_restart(), causing qdisc_restart() to print a warning an requeue/retransmit the skb. - cycx_x25: intention appears to be to requeue the skb Does not compile cleanly for me even without this patch, so untested. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wan/cycx_x25.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wan/cycx_x25.c b/drivers/net/wan/cycx_x25.c
index 35dea3bea95d..f525f9fe74db 100644
--- a/drivers/net/wan/cycx_x25.c
+++ b/drivers/net/wan/cycx_x25.c
@@ -615,7 +615,7 @@ static int cycx_netdevice_hard_start_xmit(struct sk_buff *skb,
615 case WAN_DISCONNECTED: 615 case WAN_DISCONNECTED:
616 if (cycx_x25_chan_connect(dev)) { 616 if (cycx_x25_chan_connect(dev)) {
617 netif_stop_queue(dev); 617 netif_stop_queue(dev);
618 return -EBUSY; 618 return NETDEV_TX_BUSY;
619 } 619 }
620 /* fall thru */ 620 /* fall thru */
621 case WAN_CONNECTED: 621 case WAN_CONNECTED:
@@ -624,7 +624,7 @@ static int cycx_netdevice_hard_start_xmit(struct sk_buff *skb,
624 netif_stop_queue(dev); 624 netif_stop_queue(dev);
625 625
626 if (cycx_x25_chan_send(dev, skb)) 626 if (cycx_x25_chan_send(dev, skb))
627 return -EBUSY; 627 return NETDEV_TX_BUSY;
628 628
629 break; 629 break;
630 default: 630 default:
@@ -656,7 +656,7 @@ static int cycx_netdevice_hard_start_xmit(struct sk_buff *skb,
656 if (cycx_x25_chan_send(dev, skb)) { 656 if (cycx_x25_chan_send(dev, skb)) {
657 /* prepare for future retransmissions */ 657 /* prepare for future retransmissions */
658 skb_push(skb, 1); 658 skb_push(skb, 1);
659 return -EBUSY; 659 return NETDEV_TX_BUSY;
660 } 660 }
661 } 661 }
662 662