aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKlaus-Dieter Wacker <kdwacker@de.ibm.com>2009-03-23 23:27:44 -0400
committerDavid S. Miller <davem@davemloft.net>2009-03-24 18:24:27 -0400
commit9e669d327a873bbab51e7e95ee9f9c3c49755594 (patch)
tree7fad0cf52648f7459ac81445c1b57e7ab64b1de1
parente5b5719b06d3c614e904bc817177bd3c49c52edb (diff)
lcs: invalid return codes from hard_start_xmit.
Lcs hard_start_xmit routine issued return codes other than defined for this interface. Now lcs returns only either NETDEV_TX_OK or NETDEV_TX_BUSY. Signed-off-by: Klaus-Dieter Wacker <kdwacker@de.ibm.com> Signed-off-by: Ursula Braun <ursula.braun@de.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/s390/net/lcs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c
index 840dbf3d3416..a45bc24eb5f9 100644
--- a/drivers/s390/net/lcs.c
+++ b/drivers/s390/net/lcs.c
@@ -1562,7 +1562,7 @@ __lcs_start_xmit(struct lcs_card *card, struct sk_buff *skb,
1562 if (skb == NULL) { 1562 if (skb == NULL) {
1563 card->stats.tx_dropped++; 1563 card->stats.tx_dropped++;
1564 card->stats.tx_errors++; 1564 card->stats.tx_errors++;
1565 return -EIO; 1565 return 0;
1566 } 1566 }
1567 if (card->state != DEV_STATE_UP) { 1567 if (card->state != DEV_STATE_UP) {
1568 dev_kfree_skb(skb); 1568 dev_kfree_skb(skb);
@@ -1587,7 +1587,7 @@ __lcs_start_xmit(struct lcs_card *card, struct sk_buff *skb,
1587 card->tx_buffer = lcs_get_buffer(&card->write); 1587 card->tx_buffer = lcs_get_buffer(&card->write);
1588 if (card->tx_buffer == NULL) { 1588 if (card->tx_buffer == NULL) {
1589 card->stats.tx_dropped++; 1589 card->stats.tx_dropped++;
1590 rc = -EBUSY; 1590 rc = NETDEV_TX_BUSY;
1591 goto out; 1591 goto out;
1592 } 1592 }
1593 card->tx_buffer->callback = lcs_txbuffer_cb; 1593 card->tx_buffer->callback = lcs_txbuffer_cb;