diff options
author | Julian Wiedmann <jwi@linux.ibm.com> | 2020-03-10 18:38:01 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2020-03-11 00:07:49 +0100 |
commit | 240c1948491b81cfe40f84ea040a8f2a4966f101 (patch) | |
tree | a1dc4c7b61816280c03d5f3beb233359c97f1529 | |
parent | Merge branch 'MACSec-bugfixes-related-to-MAC-address-change' (diff) | |
download | linux-240c1948491b81cfe40f84ea040a8f2a4966f101.tar.xz linux-240c1948491b81cfe40f84ea040a8f2a4966f101.zip |
s390/qeth: don't reset default_out_queue
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>
-rw-r--r-- | drivers/s390/net/qeth_core_main.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c index 8ca85c8a01a1..2a05d13a0e79 100644 --- a/drivers/s390/net/qeth_core_main.c +++ b/drivers/s390/net/qeth_core_main.c @@ -1204,7 +1204,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; } |