From 5e74e396a03e6c3988d6e6346fb600f182daa6e4 Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Fri, 12 Jun 2009 04:37:34 +0000 Subject: [PATCH] --- yaml --- r: 150931 b: refs/heads/master c: 47f88c99c2ad0c05dd415e1c2a6d59426eb305ed h: refs/heads/master i: 150929: 2a97fe7c57298027113dbcc7aeddb00dc8cc83ce 150927: 890c534e9724dd8fcedf5d7c7b2077209d548f74 v: v3 --- [refs] | 2 +- trunk/drivers/net/wan/cycx_x25.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b5576d51a2b2..1b3baa78b5a6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4153e77596c4caaf52293b0c6b2207d73ed8f1eb +refs/heads/master: 47f88c99c2ad0c05dd415e1c2a6d59426eb305ed diff --git a/trunk/drivers/net/wan/cycx_x25.c b/trunk/drivers/net/wan/cycx_x25.c index 35dea3bea95d..f525f9fe74db 100644 --- a/trunk/drivers/net/wan/cycx_x25.c +++ b/trunk/drivers/net/wan/cycx_x25.c @@ -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: @@ -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: @@ -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; } }