OSDN Git Service

s390/qeth: remove check for packing mode in qeth_check_outbound_queue()
authorJulian Wiedmann <jwi@linux.ibm.com>
Tue, 7 Dec 2021 09:04:52 +0000 (10:04 +0100)
committerJakub Kicinski <kuba@kernel.org>
Wed, 8 Dec 2021 06:01:03 +0000 (22:01 -0800)
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: Julian Wiedmann <jwi@linux.ibm.com>
Reviewed-by: Alexandra Winter <wintera@linux.ibm.com>
Signed-off-by: Alexandra Winter <wintera@linux.ibm.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/s390/net/qeth_core_main.c

index 093ee14..c296e05 100644 (file)
@@ -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,8 +3646,7 @@ 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);
+                       QETH_TXQ_STAT_ADD(queue, bufs_pack, flush_cnt);
                }
 
                spin_unlock(&queue->lock);