Commit 17413852 authored by Julian Wiedmann's avatar Julian Wiedmann Committed by David S. Miller
Browse files

s390/qeth: handle error when backing RX buffer 



qeth_init_qdio_queues() fills the RX ring with an initial set of
RX buffers. If qeth_init_input_buffer() fails to back one of the RX
buffers with memory, we need to bail out and report the error.

Fixes: 4a71df50 ("qeth: new qeth device driver")
Signed-off-by: default avatarJulian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 240c1948

drivers/s390/net/qeth_core_main.c

+9 −4
Original line number Diff line number Diff line
@@ -2624,12 +2624,12 @@ static int qeth_init_input_buffer(struct qeth_card *card, 
					       ETH_HLEN +

					       sizeof(struct ipv6hdr));

		if (!buf->rx_skb)

			return 1;

			return -ENOMEM;

	}



	pool_entry = qeth_find_free_buffer_pool_entry(card);

	if (!pool_entry)

		return 1;

		return -ENOBUFS;



	/*

	 * since the buffer is accessed only from the input_tasklet
@@ -2674,10 +2674,15 @@ static int qeth_init_qdio_queues(struct qeth_card *card) 
	/* inbound queue */

	qdio_reset_buffers(card->qdio.in_q->qdio_bufs, QDIO_MAX_BUFFERS_PER_Q);

	memset(&card->rx, 0, sizeof(struct qeth_rx));



	qeth_initialize_working_pool_list(card);

	/*give only as many buffers to hardware as we have buffer pool entries*/

	for (i = 0; i < card->qdio.in_buf_pool.buf_count - 1; ++i)

		qeth_init_input_buffer(card, &card->qdio.in_q->bufs[i]);

	for (i = 0; i < card->qdio.in_buf_pool.buf_count - 1; i++) {

		rc = qeth_init_input_buffer(card, &card->qdio.in_q->bufs[i]);

		if (rc)

			return rc;

	}



	card->qdio.in_q->next_buf_to_init =

		card->qdio.in_buf_pool.buf_count - 1;

	rc = do_QDIO(CARD_DDEV(card), QDIO_FLAG_SYNC_INPUT, 0, 0,

CRA Git | Maintained and supported by SUSTech CRA and CCSE