Commit 6dc490e8 authored by Julian Wiedmann's avatar Julian Wiedmann Committed by Jakub Kicinski
Browse files

s390/qeth: remove check for packing mode in qeth_check_outbound_queue() 



If qeth_check_outbound_queue() finds a partially filled TX buffer on
the queue and flushes it, then the queue _must_ have been in packing
mode.

Remove the redundant check when updating the relevant statistics.

Signed-off-by: default avatarJulian Wiedmann <jwi@linux.ibm.com>
Reviewed-by: default avatarAlexandra Winter <wintera@linux.ibm.com>
Signed-off-by: default avatarAlexandra Winter <wintera@linux.ibm.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 1b9e410f

drivers/s390/net/qeth_core_main.c

+1 −4
Original line number Diff line number Diff line
@@ -3635,12 +3635,10 @@ static void qeth_check_outbound_queue(struct qeth_qdio_out_q *queue) 
	if ((atomic_read(&queue->used_buffers) <= QETH_LOW_WATERMARK_PACK) ||

	    !atomic_read(&queue->set_pci_flags_count)) {

		unsigned int index, flush_cnt;

		bool q_was_packing;



		spin_lock(&queue->lock);



		index = queue->next_buf_to_fill;

		q_was_packing = queue->do_pack;



		flush_cnt = qeth_switch_to_nonpacking_if_needed(queue);

		if (!flush_cnt && !atomic_read(&queue->set_pci_flags_count))
@@ -3648,7 +3646,6 @@ static void qeth_check_outbound_queue(struct qeth_qdio_out_q *queue) 


		if (flush_cnt) {

			qeth_flush_buffers(queue, index, flush_cnt);

			if (q_was_packing)

			QETH_TXQ_STAT_ADD(queue, bufs_pack, flush_cnt);

		}