lcs: invalid return codes from hard_start_xmit.

[karo-tx-linux.git] / drivers / s390 / net / lcs.c

diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c
index bca08eff4a778f42357758aa02fe408298b3ec8a..a45bc24eb5f91627c03eabc94575a71ed0a6053f 100644 (file)
--- a/drivers/s390/net/lcs.c
+++ b/drivers/s390/net/lcs.c
@@ -39,6 +39,7 @@
 #include <linux/in.h>
 #include <linux/igmp.h>
 #include <linux/delay.h>
+#include <linux/kthread.h>
 #include <net/arp.h>
 #include <net/ip.h>
 
@@ -70,7 +71,9 @@ static char debug_buffer[255];
 static void lcs_tasklet(unsigned long);
 static void lcs_start_kernel_thread(struct work_struct *);
 static void lcs_get_frames_cb(struct lcs_channel *, struct lcs_buffer *);
+#ifdef CONFIG_IP_MULTICAST
 static int lcs_send_delipm(struct lcs_card *, struct lcs_ipm_list *);
+#endif /* CONFIG_IP_MULTICAST */
 static int lcs_recovery(void *ptr);
 
 /**
@@ -1257,7 +1260,6 @@ lcs_register_mc_addresses(void *data)
        struct in_device *in4_dev;
 
        card = (struct lcs_card *) data;
-       daemonize("regipm");
 
        if (!lcs_do_run_thread(card, LCS_SET_MC_THREAD))
                return 0;
@@ -1285,6 +1287,8 @@ out:
        lcs_clear_thread_running_bit(card, LCS_SET_MC_THREAD);
        return 0;
 }
+#endif /* CONFIG_IP_MULTICAST */
+
 /**
  * function called by net device to
  * handle multicast address relevant things
@@ -1292,6 +1296,7 @@ out:
 static void
 lcs_set_multicast_list(struct net_device *dev)
 {
+#ifdef CONFIG_IP_MULTICAST
         struct lcs_card *card;
 
         LCS_DBF_TEXT(4, trace, "setmulti");
@@ -1299,9 +1304,8 @@ lcs_set_multicast_list(struct net_device *dev)
 
         if (!lcs_set_thread_start_bit(card, LCS_SET_MC_THREAD))
                schedule_work(&card->kernel_thread_starter);
-}
-
 #endif /* CONFIG_IP_MULTICAST */
+}
 
 static long
 lcs_check_irb_error(struct ccw_device *cdev, struct irb *irb)
@@ -1558,7 +1562,7 @@ __lcs_start_xmit(struct lcs_card *card, struct sk_buff *skb,
        if (skb == NULL) {
                card->stats.tx_dropped++;
                card->stats.tx_errors++;
-               return -EIO;
+               return 0;
        }
        if (card->state != DEV_STATE_UP) {
                dev_kfree_skb(skb);
@@ -1583,7 +1587,7 @@ __lcs_start_xmit(struct lcs_card *card, struct sk_buff *skb,
                card->tx_buffer = lcs_get_buffer(&card->write);
                if (card->tx_buffer == NULL) {
                        card->stats.tx_dropped++;
-                       rc = -EBUSY;
+                       rc = NETDEV_TX_BUSY;
                        goto out;
                }
                card->tx_buffer->callback = lcs_txbuffer_cb;
@@ -1749,11 +1753,10 @@ lcs_start_kernel_thread(struct work_struct *work)
        struct lcs_card *card = container_of(work, struct lcs_card, kernel_thread_starter);
        LCS_DBF_TEXT(5, trace, "krnthrd");
        if (lcs_do_start_thread(card, LCS_RECOVERY_THREAD))
-               kernel_thread(lcs_recovery, (void *) card, SIGCHLD);
+               kthread_run(lcs_recovery, card, "lcs_recover");
 #ifdef CONFIG_IP_MULTICAST
        if (lcs_do_start_thread(card, LCS_SET_MC_THREAD))
-               kernel_thread(lcs_register_mc_addresses,
-                               (void *) card, SIGCHLD);
+               kthread_run(lcs_register_mc_addresses, card, "regipm");
 #endif
 }
 
@@ -2265,7 +2268,6 @@ lcs_recovery(void *ptr)
         int rc;
 
        card = (struct lcs_card *) ptr;
-       daemonize("lcs_recover");
 
        LCS_DBF_TEXT(4, trace, "recover1");
        if (!lcs_do_run_thread(card, LCS_RECOVERY_THREAD))