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

s390/qeth: remove QETH_QDIO_BUF_HANDLED_DELAYED state 



Reuse the QETH_QDIO_BUF_EMPTY state to indicate that a TX buffer has
been completed with a QAOB notification, and may be cleaned up by
qeth_cleanup_handled_pending().

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

drivers/s390/net/qeth_core.h

+0 −2
Original line number Diff line number Diff line
@@ -424,8 +424,6 @@ enum qeth_qdio_out_buffer_state { 
	/* Received QAOB notification on CQ: */

	QETH_QDIO_BUF_QAOB_OK,

	QETH_QDIO_BUF_QAOB_ERROR,

	/* Handled via transfer pending / completion queue. */

	QETH_QDIO_BUF_HANDLED_DELAYED,

};



struct qeth_qdio_out_buffer {

drivers/s390/net/qeth_core_main.c

+2 −3
Original line number Diff line number Diff line
@@ -477,8 +477,7 @@ static void qeth_cleanup_handled_pending(struct qeth_qdio_out_q *q, int bidx, 


		while (c) {

			if (forced_cleanup ||

			    atomic_read(&c->state) ==

			      QETH_QDIO_BUF_HANDLED_DELAYED) {

			    atomic_read(&c->state) == QETH_QDIO_BUF_EMPTY) {

				struct qeth_qdio_out_buffer *f = c;



				QETH_CARD_TEXT(f->q->card, 5, "fp");
@@ -549,7 +548,7 @@ static void qeth_qdio_handle_aob(struct qeth_card *card, 
				kmem_cache_free(qeth_core_header_cache, data);

		}



		atomic_set(&buffer->state, QETH_QDIO_BUF_HANDLED_DELAYED);

		atomic_set(&buffer->state, QETH_QDIO_BUF_EMPTY);

		break;

	default:

		WARN_ON_ONCE(1);