net: use NETDEV_TX_OK instead of 0 in ndo_start_xmit() functions

This patch is the result of an automatic spatch transformation to convert
all ndo_start_xmit() return values of 0 to NETDEV_TX_OK.

Some occurences are missed by the automatic conversion, those will be
handled in a seperate patch.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

4 files changed, 11 insertions, 11 deletions

diff --git a/drivers/net/wan/cycx_x25.c b/drivers/net/wan/cycx_x25.c
index f525f9fe74db..4ae9bd297cc2 100644
--- a/drivers/net/wan/cycx_x25.c
+++ b/drivers/net/wan/cycx_x25.c
@@ -663,7 +663,7 @@ static int cycx_netdevice_hard_start_xmit(struct sk_buff *skb,
 free_packet:
         dev_kfree_skb(skb);
 
-        return 0;
+        return NETDEV_TX_OK;
 }
 
 /* Get Ethernet-style interface statistics.
diff --git a/drivers/net/wan/hdlc_fr.c b/drivers/net/wan/hdlc_fr.c
index bfa0161a02d3..52438c76bf8a 100644
--- a/drivers/net/wan/hdlc_fr.c
+++ b/drivers/net/wan/hdlc_fr.c
@@ -421,7 +421,7 @@ static int pvc_xmit(struct sk_buff *skb, struct net_device *dev)
                                                              GFP_ATOMIC)) {
                                                 dev->stats.tx_dropped++;
                                                 dev_kfree_skb(skb);
-                                                return 0;
+                                                return NETDEV_TX_OK;
                                         }
                                 skb_put(skb, pad);
                                 memset(skb->data + len, 0, pad);
@@ -435,13 +435,13 @@ static int pvc_xmit(struct sk_buff *skb, struct net_device *dev)
                                 dev->stats.tx_compressed++;
                         skb->dev = pvc->frad;
                         dev_queue_xmit(skb);
-                        return 0;
+                        return NETDEV_TX_OK;
                 }
         }
 
         dev->stats.tx_dropped++;
         dev_kfree_skb(skb);
-        return 0;
+        return NETDEV_TX_OK;
 }
 
 static inline void fr_log_dlci_active(pvc_device *pvc)
diff --git a/drivers/net/wan/sbni.c b/drivers/net/wan/sbni.c
index 3fb9dbc88a1a..545178e6765d 100644
--- a/drivers/net/wan/sbni.c
+++ b/drivers/net/wan/sbni.c
@@ -465,7 +465,7 @@ sbni_start_xmit( struct sk_buff  *skb,  struct net_device  *dev )
                         prepare_to_send( skb, p );
                         spin_unlock( &nl->lock );
                         netif_start_queue( dev );
-                        return  0;
+                        return NETDEV_TX_OK;
                 }
         }
 
@@ -485,7 +485,7 @@ sbni_start_xmit( struct sk_buff  *skb,  struct net_device  *dev )
         prepare_to_send( skb, dev );
 
         spin_unlock( &nl->lock );
-        return  0;
+        return NETDEV_TX_OK;
 }
 
 #endif  /* CONFIG_SBNI_MULTILINE */
diff --git a/drivers/net/wan/x25_asy.c b/drivers/net/wan/x25_asy.c
index d67e208ab375..1047920e742c 100644
--- a/drivers/net/wan/x25_asy.c
+++ b/drivers/net/wan/x25_asy.c
@@ -308,7 +308,7 @@ static int x25_asy_xmit(struct sk_buff *skb, struct net_device *dev)
                 printk(KERN_ERR "%s: xmit call when iface is down\n",
                         dev->name);
                 kfree_skb(skb);
-                return 0;
+                return NETDEV_TX_OK;
         }
 
         switch (skb->data[0]) {
@@ -319,14 +319,14 @@ static int x25_asy_xmit(struct sk_buff *skb, struct net_device *dev)
                 if (err != LAPB_OK)
                         printk(KERN_ERR "x25_asy: lapb_connect_request error - %d\n", err);
                 kfree_skb(skb);
-                return 0;
+                return NETDEV_TX_OK;
         case 0x02: /* Disconnect request .. do nothing - hang up ?? */
                 err = lapb_disconnect_request(dev);
                 if (err != LAPB_OK)
                         printk(KERN_ERR "x25_asy: lapb_disconnect_request error - %d\n", err);
         default:
                 kfree_skb(skb);
-                return  0;
+                return NETDEV_TX_OK;
         }
         skb_pull(skb, 1);       /* Remove control byte */
         /*
@@ -344,9 +344,9 @@ static int x25_asy_xmit(struct sk_buff *skb, struct net_device *dev)
         if (err != LAPB_OK) {
                 printk(KERN_ERR "x25_asy: lapb_data_request error - %d\n", err);
                 kfree_skb(skb);
-                return 0;
+                return NETDEV_TX_OK;
         }
-        return 0;
+        return NETDEV_TX_OK;
 }