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>

8 files changed, 14 insertions, 14 deletions

diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index dfb30b9c4267..c70604f0329e 100644
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@ -1935,7 +1935,7 @@ static int mpi_start_xmit(struct sk_buff *skb, struct net_device *dev) {
                 netif_stop_queue (dev);
                 if (npacks > MAXTXQ) {
                         dev->stats.tx_fifo_errors++;
-                        return 1;
+                        return NETDEV_TX_BUSY;
                 }
                 skb_queue_tail (&ai->txq, skb);
                 return 0;
@@ -2139,7 +2139,7 @@ static int airo_start_xmit(struct sk_buff *skb, struct net_device *dev) {
 
                 if (i == MAX_FIDS / 2) {
                         dev->stats.tx_fifo_errors++;
-                        return 1;
+                        return NETDEV_TX_BUSY;
                 }
         }
         /* check min length*/
@@ -2211,7 +2211,7 @@ static int airo_start_xmit11(struct sk_buff *skb, struct net_device *dev) {
 
                 if (i == MAX_FIDS) {
                         dev->stats.tx_fifo_errors++;
-                        return 1;
+                        return NETDEV_TX_BUSY;
                 }
         }
         /* check min length*/
diff --git a/drivers/net/wireless/arlan-main.c b/drivers/net/wireless/arlan-main.c
index a54a67c425c8..d84caf198a23 100644
--- a/drivers/net/wireless/arlan-main.c
+++ b/drivers/net/wireless/arlan-main.c
@@ -1199,7 +1199,7 @@ bad_end:
         arlan_process_interrupt(dev);
         netif_stop_queue (dev);
         ARLAN_DEBUG_EXIT("arlan_tx");
-        return 1;
+        return NETDEV_TX_BUSY;
 }
 
 
diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c
index 27eef8fb7107..291a94bd46fd 100644
--- a/drivers/net/wireless/atmel.c
+++ b/drivers/net/wireless/atmel.c
@@ -818,7 +818,7 @@ static int start_tx(struct sk_buff *skb, struct net_device *dev)
                 spin_unlock_irqrestore(&priv->irqlock, flags);
                 spin_unlock_bh(&priv->timerlock);
                 netif_stop_queue(dev);
-                return 1;
+                return NETDEV_TX_BUSY;
         }
 
         frame_ctl = IEEE80211_FTYPE_DATA;
diff --git a/drivers/net/wireless/hostap/hostap_80211_tx.c b/drivers/net/wireless/hostap/hostap_80211_tx.c
index 6693423f63fe..d313b005114e 100644
--- a/drivers/net/wireless/hostap/hostap_80211_tx.c
+++ b/drivers/net/wireless/hostap/hostap_80211_tx.c
@@ -377,7 +377,7 @@ int hostap_master_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
         struct hostap_interface *iface;
         local_info_t *local;
-        int ret = 1;
+        int ret = NETDEV_TX_BUSY;
         u16 fc;
         struct hostap_tx_data tx;
         ap_tx_ret tx_ret;
diff --git a/drivers/net/wireless/ipw2x00/libipw_tx.c b/drivers/net/wireless/ipw2x00/libipw_tx.c
index 65a8195b3d90..da2ad5437ce5 100644
--- a/drivers/net/wireless/ipw2x00/libipw_tx.c
+++ b/drivers/net/wireless/ipw2x00/libipw_tx.c
@@ -539,7 +539,7 @@ int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev)
         spin_unlock_irqrestore(&ieee->lock, flags);
         netif_stop_queue(dev);
         dev->stats.tx_errors++;
-        return 1;
+        return NETDEV_TX_BUSY;
 }
 EXPORT_SYMBOL(ieee80211_xmit);
 
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c
index 22e71856aa24..b10b0383dfa5 100644
--- a/drivers/net/wireless/ray_cs.c
+++ b/drivers/net/wireless/ray_cs.c
@@ -923,7 +923,7 @@ static int ray_dev_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
         if (!(pcmcia_dev_present(link))) {
                 DEBUG(2, "ray_dev_start_xmit - device not present\n");
-                return -1;
+                return NETDEV_TX_LOCKED;
         }
         DEBUG(3, "ray_dev_start_xmit(skb=%p, dev=%p)\n", skb, dev);
         if (local->authentication_state == NEED_TO_AUTH) {
@@ -931,7 +931,7 @@ static int ray_dev_start_xmit(struct sk_buff *skb, struct net_device *dev)
                 if (!build_auth_frame(local, local->auth_id, OPEN_AUTH_REQUEST)) {
                         local->authentication_state = AUTHENTICATED;
                         netif_stop_queue(dev);
-                        return 1;
+                        return NETDEV_TX_BUSY;
                 }
         }
 
@@ -944,7 +944,7 @@ static int ray_dev_start_xmit(struct sk_buff *skb, struct net_device *dev)
         case XMIT_NO_CCS:
         case XMIT_NEED_AUTH:
                 netif_stop_queue(dev);
-                return 1;
+                return NETDEV_TX_BUSY;
         case XMIT_NO_INTR:
         case XMIT_MSG_BAD:
         case XMIT_OK:
diff --git a/drivers/net/wireless/strip.c b/drivers/net/wireless/strip.c
index b7b0c46adb46..38366a56b71f 100644
--- a/drivers/net/wireless/strip.c
+++ b/drivers/net/wireless/strip.c
@@ -1540,7 +1540,7 @@ static int strip_xmit(struct sk_buff *skb, struct net_device *dev)
         if (!netif_running(dev)) {
                 printk(KERN_ERR "%s: xmit call when iface is down\n",
                        dev->name);
-                return (1);
+                return NETDEV_TX_BUSY;
         }
 
         netif_stop_queue(dev);
diff --git a/drivers/net/wireless/wavelan.c b/drivers/net/wireless/wavelan.c
index 25d27b64f528..ab7fc5c0c8b4 100644
--- a/drivers/net/wireless/wavelan.c
+++ b/drivers/net/wireless/wavelan.c
@@ -2867,7 +2867,7 @@ static int wavelan_packet_xmit(struct sk_buff *skb, struct net_device * dev)
                 spin_unlock_irqrestore(&lp->spinlock, flags);
                 /* Check that we can continue */
                 if (lp->tx_n_in_use == (NTXBLOCKS - 1))
-                        return 1;
+                        return NETDEV_TX_BUSY;
         }
 
         /* Do we need some padding? */
@@ -2880,10 +2880,10 @@ static int wavelan_packet_xmit(struct sk_buff *skb, struct net_device * dev)
                 skb_copy_from_linear_data(skb, data, skb->len);
                 /* Write packet on the card */
                 if(wv_packet_write(dev, data, ETH_ZLEN))
-                        return 1;       /* We failed */
+                        return NETDEV_TX_BUSY;  /* We failed */
         }
         else if(wv_packet_write(dev, skb->data, skb->len))
-                return 1;       /* We failed */
+                return NETDEV_TX_BUSY;  /* We failed */
 
 
         dev_kfree_skb(skb);