s390/qeth: keep track of fixed prio-queue configuration

When a device is configured in prio-queue mode to pin all traffic onto
a specific HW queue, treat this as a distinct variant of prio-queueing
instead of QETH_NO_PRIO_QUEUEING.

This corrects an error message from qeth_osa_set_output_queues() for
devices configured in such a mode.

Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/s390/net/qeth_core.h b/drivers/s390/net/qeth_core.h
index a6553e78af0859558b640497c5c6970f2a1d1bc4..5f85617bdce31da00d2663fc055c6bccdf544889 100644 (file)
--- a/drivers/s390/net/qeth_core.h
+++ b/drivers/s390/net/qeth_core.h
@@ -211,6 +211,7 @@ struct qeth_vnicc_info {
 #define QETH_PRIO_Q_ING_TOS   2
 #define QETH_PRIO_Q_ING_SKB   3
 #define QETH_PRIO_Q_ING_VLAN  4
+#define QETH_PRIO_Q_ING_FIXED 5
 
 /* Packing */
 #define QETH_LOW_WATERMARK_PACK  2

diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
index 0c9f1464a778eaad6d720a40a64af7ed0cc9fcc5..8713f1b821c12ac087a7d72a09690deb1a4b0705 100644 (file)
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -3646,6 +3646,8 @@ int qeth_get_priority_queue(struct qeth_card *card, struct sk_buff *skb)
                        return ~ntohs(veth->h_vlan_TCI) >>
                               (VLAN_PRIO_SHIFT + 1) & 3;
                break;
+       case QETH_PRIO_Q_ING_FIXED:
+               return card->qdio.default_out_queue;
        default:
                break;
        }

diff --git a/drivers/s390/net/qeth_core_sys.c b/drivers/s390/net/qeth_core_sys.c
index 533a7f26dbe199da6dd7d4f06b8c9c35f8262ca6..d7e429f6631ec6725b26bd729597632c1950e018 100644 (file)
--- a/drivers/s390/net/qeth_core_sys.c
+++ b/drivers/s390/net/qeth_core_sys.c
@@ -211,16 +211,16 @@ static ssize_t qeth_dev_prioqing_store(struct device *dev,
                card->qdio.do_prio_queueing = QETH_PRIO_Q_ING_VLAN;
                card->qdio.default_out_queue = QETH_DEFAULT_QUEUE;
        } else if (sysfs_streq(buf, "no_prio_queueing:0")) {
-               card->qdio.do_prio_queueing = QETH_NO_PRIO_QUEUEING;
+               card->qdio.do_prio_queueing = QETH_PRIO_Q_ING_FIXED;
                card->qdio.default_out_queue = 0;
        } else if (sysfs_streq(buf, "no_prio_queueing:1")) {
-               card->qdio.do_prio_queueing = QETH_NO_PRIO_QUEUEING;
+               card->qdio.do_prio_queueing = QETH_PRIO_Q_ING_FIXED;
                card->qdio.default_out_queue = 1;
        } else if (sysfs_streq(buf, "no_prio_queueing:2")) {
-               card->qdio.do_prio_queueing = QETH_NO_PRIO_QUEUEING;
+               card->qdio.do_prio_queueing = QETH_PRIO_Q_ING_FIXED;
                card->qdio.default_out_queue = 2;
        } else if (sysfs_streq(buf, "no_prio_queueing:3")) {
-               card->qdio.do_prio_queueing = QETH_NO_PRIO_QUEUEING;
+               card->qdio.do_prio_queueing = QETH_PRIO_Q_ING_FIXED;
                card->qdio.default_out_queue = 3;
        } else if (sysfs_streq(buf, "no_prio_queueing")) {
                card->qdio.do_prio_queueing = QETH_NO_PRIO_QUEUEING;