Просмотр исходного кода

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>
Klaus-Dieter Wacker 16 лет назад
Родитель
Сommit
9e669d327a
1 измененных файлов с 2 добавлено и 2 удалено
  1. 2 2
      drivers/s390/net/lcs.c

+ 2 - 2
drivers/s390/net/lcs.c

@@ -1562,7 +1562,7 @@ __lcs_start_xmit(struct lcs_card *card, struct sk_buff *skb,
 	if (skb == NULL) {
 	if (skb == NULL) {
 		card->stats.tx_dropped++;
 		card->stats.tx_dropped++;
 		card->stats.tx_errors++;
 		card->stats.tx_errors++;
-		return -EIO;
+		return 0;
 	}
 	}
 	if (card->state != DEV_STATE_UP) {
 	if (card->state != DEV_STATE_UP) {
 		dev_kfree_skb(skb);
 		dev_kfree_skb(skb);
@@ -1587,7 +1587,7 @@ __lcs_start_xmit(struct lcs_card *card, struct sk_buff *skb,
 		card->tx_buffer = lcs_get_buffer(&card->write);
 		card->tx_buffer = lcs_get_buffer(&card->write);
 		if (card->tx_buffer == NULL) {
 		if (card->tx_buffer == NULL) {
 			card->stats.tx_dropped++;
 			card->stats.tx_dropped++;
-			rc = -EBUSY;
+			rc = NETDEV_TX_BUSY;
 			goto out;
 			goto out;
 		}
 		}
 		card->tx_buffer->callback = lcs_txbuffer_cb;
 		card->tx_buffer->callback = lcs_txbuffer_cb;