aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2009-07-05 22:23:38 -0400
committerDavid S. Miller <davem@davemloft.net>2009-07-05 22:23:38 -0400
commitec634fe328182a1a098585bfc7b69e5042bdb08d (patch)
tree02883aaee743af10d78d6d8fe9181944b4dd4529 /drivers/s390
parenta73e76e23c20c05cb8c0b7ba8bc9daa04b05c80f (diff)
net: convert remaining non-symbolic return values in ndo_start_xmit() functions
This patch converts the remaining occurences of raw return values to their symbolic counterparts in ndo_start_xmit() functions that were missed by the previous automatic conversion. Additionally code that assumed the symbolic value of NETDEV_TX_OK to be zero is changed to explicitly use NETDEV_TX_OK. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/s390')
-rw-r--r--drivers/s390/net/claw.c2
-rw-r--r--drivers/s390/net/lcs.c8
-rw-r--r--drivers/s390/net/netiucv.c6
-rw-r--r--drivers/s390/net/qeth_l2_main.c1
-rw-r--r--drivers/s390/net/qeth_l3_main.c1
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)
350 CLAW_DBF_TEXT_(4, trace, "clawtx%d", rc); 350 CLAW_DBF_TEXT_(4, trace, "clawtx%d", rc);
351 if (rc) 351 if (rc)
352 rc = NETDEV_TX_BUSY; 352 rc = NETDEV_TX_BUSY;
353 else
354 rc = NETDEV_TX_OK;
353 return rc; 355 return rc;
354} /* end of claw_tx */ 356} /* end of claw_tx */
355 357
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,
1553 struct net_device *dev) 1553 struct net_device *dev)
1554{ 1554{
1555 struct lcs_header *header; 1555 struct lcs_header *header;
1556 int rc = 0; 1556 int rc = NETDEV_TX_OK;
1557 1557
1558 LCS_DBF_TEXT(5, trace, "hardxmit"); 1558 LCS_DBF_TEXT(5, trace, "hardxmit");
1559 if (skb == NULL) { 1559 if (skb == NULL) {
1560 card->stats.tx_dropped++; 1560 card->stats.tx_dropped++;
1561 card->stats.tx_errors++; 1561 card->stats.tx_errors++;
1562 return 0; 1562 return NETDEV_TX_OK;
1563 } 1563 }
1564 if (card->state != DEV_STATE_UP) { 1564 if (card->state != DEV_STATE_UP) {
1565 dev_kfree_skb(skb); 1565 dev_kfree_skb(skb);
1566 card->stats.tx_dropped++; 1566 card->stats.tx_dropped++;
1567 card->stats.tx_errors++; 1567 card->stats.tx_errors++;
1568 card->stats.tx_carrier_errors++; 1568 card->stats.tx_carrier_errors++;
1569 return 0; 1569 return NETDEV_TX_OK;
1570 } 1570 }
1571 if (skb->protocol == htons(ETH_P_IPV6)) { 1571 if (skb->protocol == htons(ETH_P_IPV6)) {
1572 dev_kfree_skb(skb); 1572 dev_kfree_skb(skb);
1573 return 0; 1573 return NETDEV_TX_OK;
1574 } 1574 }
1575 netif_stop_queue(card->dev); 1575 netif_stop_queue(card->dev);
1576 spin_lock(&card->lock); 1576 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)
1376 if (skb == NULL) { 1376 if (skb == NULL) {
1377 IUCV_DBF_TEXT(data, 2, "netiucv_tx: skb is NULL\n"); 1377 IUCV_DBF_TEXT(data, 2, "netiucv_tx: skb is NULL\n");
1378 privptr->stats.tx_dropped++; 1378 privptr->stats.tx_dropped++;
1379 return 0; 1379 return NETDEV_TX_OK;
1380 } 1380 }
1381 if (skb_headroom(skb) < NETIUCV_HDRLEN) { 1381 if (skb_headroom(skb) < NETIUCV_HDRLEN) {
1382 IUCV_DBF_TEXT(data, 2, 1382 IUCV_DBF_TEXT(data, 2,
1383 "netiucv_tx: skb_headroom < NETIUCV_HDRLEN\n"); 1383 "netiucv_tx: skb_headroom < NETIUCV_HDRLEN\n");
1384 dev_kfree_skb(skb); 1384 dev_kfree_skb(skb);
1385 privptr->stats.tx_dropped++; 1385 privptr->stats.tx_dropped++;
1386 return 0; 1386 return NETDEV_TX_OK;
1387 } 1387 }
1388 1388
1389 /** 1389 /**
@@ -1395,7 +1395,7 @@ static int netiucv_tx(struct sk_buff *skb, struct net_device *dev)
1395 privptr->stats.tx_dropped++; 1395 privptr->stats.tx_dropped++;
1396 privptr->stats.tx_errors++; 1396 privptr->stats.tx_errors++;
1397 privptr->stats.tx_carrier_errors++; 1397 privptr->stats.tx_carrier_errors++;
1398 return 0; 1398 return NETDEV_TX_OK;
1399 } 1399 }
1400 1400
1401 if (netiucv_test_and_set_busy(dev)) { 1401 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)
744 card->stats.tx_bytes += tx_bytes; 744 card->stats.tx_bytes += tx_bytes;
745 if (new_skb != skb) 745 if (new_skb != skb)
746 dev_kfree_skb_any(skb); 746 dev_kfree_skb_any(skb);
747 rc = NETDEV_TX_OK;
747 } else { 748 } else {
748 if (data_offset >= 0) 749 if (data_offset >= 0)
749 kmem_cache_free(qeth_core_header_cache, hdr); 750 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)
2793 card->perf_stats.sg_frags_sent += nr_frags + 1; 2793 card->perf_stats.sg_frags_sent += nr_frags + 1;
2794 } 2794 }
2795 } 2795 }
2796 rc = NETDEV_TX_OK;
2796 } else { 2797 } else {
2797 if (data_offset >= 0) 2798 if (data_offset >= 0)
2798 kmem_cache_free(qeth_core_header_cache, hdr); 2799 kmem_cache_free(qeth_core_header_cache, hdr);