5 files changed, 11 insertions, 7 deletions

diff --git a/drivers/s390/net/claw.c b/drivers/s390/net/claw.c
index f370f8d460a7..c63babefb698 100644
--- a/drivers/s390/net/claw.c
+++ b/drivers/s390/net/claw.c
@@ -350,6 +350,8 @@ claw_tx(struct sk_buff *skb, struct net_device *dev)
         CLAW_DBF_TEXT_(4, trace, "clawtx%d", rc);
         if (rc)
                 rc = NETDEV_TX_BUSY;
+        else
+                rc = NETDEV_TX_OK;
         return rc;
 }   /*  end of claw_tx */
 
diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c
index 8c675905448b..a70de9b4bf29 100644
--- a/drivers/s390/net/lcs.c
+++ b/drivers/s390/net/lcs.c
@@ -1553,24 +1553,24 @@ __lcs_start_xmit(struct lcs_card *card, struct sk_buff *skb,
                  struct net_device *dev)
 {
         struct lcs_header *header;
-        int rc = 0;
+        int rc = NETDEV_TX_OK;
 
         LCS_DBF_TEXT(5, trace, "hardxmit");
         if (skb == NULL) {
                 card->stats.tx_dropped++;
                 card->stats.tx_errors++;
-                return 0;
+                return NETDEV_TX_OK;
         }
         if (card->state != DEV_STATE_UP) {
                 dev_kfree_skb(skb);
                 card->stats.tx_dropped++;
                 card->stats.tx_errors++;
                 card->stats.tx_carrier_errors++;
-                return 0;
+                return NETDEV_TX_OK;
         }
         if (skb->protocol == htons(ETH_P_IPV6)) {
                 dev_kfree_skb(skb);
-                return 0;
+                return NETDEV_TX_OK;
         }
         netif_stop_queue(card->dev);
         spin_lock(&card->lock);
diff --git a/drivers/s390/net/netiucv.c b/drivers/s390/net/netiucv.c
index 8c36eafcfbfe..bb1183a2ed66 100644
--- a/drivers/s390/net/netiucv.c
+++ b/drivers/s390/net/netiucv.c
@@ -1376,14 +1376,14 @@ static int netiucv_tx(struct sk_buff *skb, struct net_device *dev)
         if (skb == NULL) {
                 IUCV_DBF_TEXT(data, 2, "netiucv_tx: skb is NULL\n");
                 privptr->stats.tx_dropped++;
-                return 0;
+                return NETDEV_TX_OK;
         }
         if (skb_headroom(skb) < NETIUCV_HDRLEN) {
                 IUCV_DBF_TEXT(data, 2,
                         "netiucv_tx: skb_headroom < NETIUCV_HDRLEN\n");
                 dev_kfree_skb(skb);
                 privptr->stats.tx_dropped++;
-                return 0;
+                return NETDEV_TX_OK;
         }
 
         /**
@@ -1395,7 +1395,7 @@ static int netiucv_tx(struct sk_buff *skb, struct net_device *dev)
                 privptr->stats.tx_dropped++;
                 privptr->stats.tx_errors++;
                 privptr->stats.tx_carrier_errors++;
-                return 0;
+                return NETDEV_TX_OK;
         }
 
         if (netiucv_test_and_set_busy(dev)) {
diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
index 691cecd03b83..2cfc338c4625 100644
--- a/drivers/s390/net/qeth_l2_main.c
+++ b/drivers/s390/net/qeth_l2_main.c
@@ -744,6 +744,7 @@ static int qeth_l2_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
                 card->stats.tx_bytes += tx_bytes;
                 if (new_skb != skb)
                         dev_kfree_skb_any(skb);
+                rc = NETDEV_TX_OK;
         } else {
                 if (data_offset >= 0)
                         kmem_cache_free(qeth_core_header_cache, hdr);
diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
index 54872406864e..048defaea81f 100644
--- a/drivers/s390/net/qeth_l3_main.c
+++ b/drivers/s390/net/qeth_l3_main.c
@@ -2793,6 +2793,7 @@ static int qeth_l3_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
                                 card->perf_stats.sg_frags_sent += nr_frags + 1;
                         }
                 }
+                rc = NETDEV_TX_OK;
         } else {
                 if (data_offset >= 0)
                         kmem_cache_free(qeth_core_header_cache, hdr);