| From 851b4b90ed0a8c8a8f122226ba45339a9dedcaa8 Mon Sep 17 00:00:00 2001 |
| From: Julian Wiedmann <jwi@linux.ibm.com> |
| Date: Tue, 10 Mar 2020 18:38:01 +0100 |
| Subject: [PATCH] s390/qeth: don't reset default_out_queue |
| |
| commit 240c1948491b81cfe40f84ea040a8f2a4966f101 upstream. |
| |
| When an OSA device in prio-queue setup is reduced to 1 TX queue due to |
| HW restrictions, we reset its the default_out_queue to 0. |
| |
| In the old code this was needed so that qeth_get_priority_queue() gets |
| the queue selection right. But with proper multiqueue support we already |
| reduced dev->real_num_tx_queues to 1, and so the stack puts all traffic |
| on txq 0 without even calling .ndo_select_queue. |
| |
| Thus we can preserve the user's configuration, and apply it if the OSA |
| device later re-gains support for multiple TX queues. |
| |
| Fixes: 73dc2daf110f ("s390/qeth: add TX multiqueue support for OSA devices") |
| Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c |
| index c45a93f8f595..8266f1962f30 100644 |
| --- a/drivers/s390/net/qeth_core_main.c |
| +++ b/drivers/s390/net/qeth_core_main.c |
| @@ -1305,7 +1305,6 @@ static int qeth_osa_set_output_queues(struct qeth_card *card, bool single) |
| if (count == 1) |
| dev_info(&card->gdev->dev, "Priority Queueing not supported\n"); |
| |
| - card->qdio.default_out_queue = single ? 0 : QETH_DEFAULT_QUEUE; |
| card->qdio.no_out_queues = count; |
| return 0; |
| } |
| -- |
| 2.7.4 |
| |
