提交 b439044b 编写于 作者: J Julian Wiedmann 提交者: David S. Miller

s390/qeth: remove redundant if-clause in RX poll code

Whenever all completed RX buffers have been processed
(ie. rx->b_count == 0), we call down to the HW layer to scan for
additional buffers. If no further buffers are available, the code
breaks out of the while-loop.

So we never reach the 'process an RX buffer' step with rx->b_count == 0,
eliminate that check and one level of indentation.
Signed-off-by: NJulian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 781b9a18
...@@ -5536,6 +5536,10 @@ static unsigned int qeth_rx_poll(struct qeth_card *card, int budget) ...@@ -5536,6 +5536,10 @@ static unsigned int qeth_rx_poll(struct qeth_card *card, int budget)
unsigned int work_done = 0; unsigned int work_done = 0;
while (budget > 0) { while (budget > 0) {
struct qeth_qdio_buffer *buffer;
unsigned int skbs_done = 0;
bool done = false;
/* Fetch completed RX buffers: */ /* Fetch completed RX buffers: */
if (!card->rx.b_count) { if (!card->rx.b_count) {
card->rx.qdio_err = 0; card->rx.qdio_err = 0;
...@@ -5549,36 +5553,28 @@ static unsigned int qeth_rx_poll(struct qeth_card *card, int budget) ...@@ -5549,36 +5553,28 @@ static unsigned int qeth_rx_poll(struct qeth_card *card, int budget)
} }
/* Process one completed RX buffer: */ /* Process one completed RX buffer: */
if (card->rx.b_count) { buffer = &card->qdio.in_q->bufs[card->rx.b_index];
struct qeth_qdio_buffer *buffer; if (!(card->rx.qdio_err &&
unsigned int skbs_done = 0; qeth_check_qdio_errors(card, buffer->buffer,
bool done = false; card->rx.qdio_err, "qinerr")))
skbs_done = qeth_extract_skbs(card, budget, buffer,
buffer = &card->qdio.in_q->bufs[card->rx.b_index]; &done);
if (!(card->rx.qdio_err && else
qeth_check_qdio_errors(card, buffer->buffer, done = true;
card->rx.qdio_err, "qinerr")))
skbs_done = qeth_extract_skbs(card, budget, work_done += skbs_done;
buffer, &done); budget -= skbs_done;
else
done = true; if (done) {
QETH_CARD_STAT_INC(card, rx_bufs);
work_done += skbs_done; qeth_put_buffer_pool_entry(card, buffer->pool_entry);
budget -= skbs_done; qeth_queue_input_buffer(card, card->rx.b_index);
card->rx.b_count--;
if (done) {
QETH_CARD_STAT_INC(card, rx_bufs); /* Step forward to next buffer: */
qeth_put_buffer_pool_entry(card, card->rx.b_index = QDIO_BUFNR(card->rx.b_index + 1);
buffer->pool_entry); card->rx.buf_element = 0;
qeth_queue_input_buffer(card, card->rx.b_index); card->rx.e_offset = 0;
card->rx.b_count--;
/* Step forward to next buffer: */
card->rx.b_index =
QDIO_BUFNR(card->rx.b_index + 1);
card->rx.buf_element = 0;
card->rx.e_offset = 0;
}
} }
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册