Skip to content

Commit

Permalink
net: fix network drivers ndo_start_xmit() return values (part 4)
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Patrick McHardy authored and David S. Miller committed Jun 13, 2009
1 parent 4153e77 commit 47f88c9
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/net/wan/cycx_x25.c
Original file line number Diff line number Diff line change
Expand Up @@ -615,7 +615,7 @@ static int cycx_netdevice_hard_start_xmit(struct sk_buff *skb,
case WAN_DISCONNECTED:
if (cycx_x25_chan_connect(dev)) {
netif_stop_queue(dev);
return -EBUSY;
return NETDEV_TX_BUSY;
}
/* fall thru */
case WAN_CONNECTED:
Expand All @@ -624,7 +624,7 @@ static int cycx_netdevice_hard_start_xmit(struct sk_buff *skb,
netif_stop_queue(dev);

if (cycx_x25_chan_send(dev, skb))
return -EBUSY;
return NETDEV_TX_BUSY;

break;
default:
Expand Down Expand Up @@ -656,7 +656,7 @@ static int cycx_netdevice_hard_start_xmit(struct sk_buff *skb,
if (cycx_x25_chan_send(dev, skb)) {
/* prepare for future retransmissions */
skb_push(skb, 1);
return -EBUSY;
return NETDEV_TX_BUSY;
}
}

Expand Down

0 comments on commit 47f88c9

Please sign in to comment.