Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

s390/qeth: reset NAPI context during queue init 



init_qdio_queues() resets the Input Queue's overall QDIO state, and
positions the buffer cursor back to 0. So this is the obvious place to
also reset the queue's NAPI context (in contrast to doing it rather
randomly in the middle of the big set_online() path).
No functional change.

Signed-off-by: default avatarJulian Wiedmann <jwi@linux.vnet.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 04f67398

drivers/s390/net/qeth_core_main.c

+2 −2
Original line number Diff line number Diff line
@@ -2873,8 +2873,8 @@ int qeth_init_qdio_queues(struct qeth_card *card) 
	QETH_DBF_TEXT(SETUP, 2, "initqdqs");



	/* inbound queue */

	qdio_reset_buffers(card->qdio.in_q->qdio_bufs,

			   QDIO_MAX_BUFFERS_PER_Q);

	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)

drivers/s390/net/qeth_l2_main.c

+0 −1
Original line number Diff line number Diff line
@@ -1087,7 +1087,6 @@ static int __qeth_l2_set_online(struct ccwgroup_device *gdev, int recovery_mode) 
	qeth_l2_setup_bridgeport_attrs(card);



	card->state = CARD_STATE_HARDSETUP;

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

	qeth_print_status_message(card);



	/* softsetup */

drivers/s390/net/qeth_l3_main.c

+0 −1
Original line number Diff line number Diff line
@@ -2898,7 +2898,6 @@ static int __qeth_l3_set_online(struct ccwgroup_device *gdev, int recovery_mode) 
		card->info.hwtrap = 0;



	card->state = CARD_STATE_HARDSETUP;

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

	qeth_print_status_message(card);



	/* softsetup */