s390/qdio: refactor ACK processing for primed SBALs

inbound_primed() currently has two code paths - one for QEBSM that knows
how to deal with multiple ACKs, and a non-QEBSM path that strictly
assumes a single ACK on the queue.

In preparation for a subsequent patch, slightly adjust the non-QEBSM
path so that it can manage a queue with multiple ACKs.

Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>

diff --git a/drivers/s390/cio/qdio_main.c b/drivers/s390/cio/qdio_main.c
index c3d696b..eea3032 100644 (file)
--- a/drivers/s390/cio/qdio_main.c
+++ b/drivers/s390/cio/qdio_main.c
@@ -466,15 +466,14 @@ static inline void inbound_primed(struct qdio_q *q, unsigned int start,
         * or by the next inbound run.
         */
        new = add_buf(start, count - 1);
-       if (q->u.in.ack_count) {
-               /* reset the previous ACK but first set the new one */
-               set_buf_state(q, new, SLSB_P_INPUT_ACK);
-               set_buf_state(q, q->u.in.ack_start, SLSB_P_INPUT_NOT_INIT);
-       } else {
-               q->u.in.ack_count = 1;
-               set_buf_state(q, new, SLSB_P_INPUT_ACK);
-       }
+       set_buf_state(q, new, SLSB_P_INPUT_ACK);
+
+       /* delete the previous ACKs */
+       if (q->u.in.ack_count)
+               set_buf_states(q, q->u.in.ack_start, SLSB_P_INPUT_NOT_INIT,
+                              q->u.in.ack_count);
 
+       q->u.in.ack_count = 1;
        q->u.in.ack_start = new;
        count--;
        if (!count)