3 files changed, 27 insertions, 4 deletions

diff --git a/drivers/s390/net/qeth_core.h b/drivers/s390/net/qeth_core.h
index 0a4148d2d962..a2088af51cc5 100644
--- a/drivers/s390/net/qeth_core.h
+++ b/drivers/s390/net/qeth_core.h
@@ -268,6 +268,8 @@ static inline int qeth_is_ipa_enabled(struct qeth_ipa_info *ipa,
 #define QETH_NO_PRIO_QUEUEING 0
 #define QETH_PRIO_Q_ING_PREC  1
 #define QETH_PRIO_Q_ING_TOS   2
+#define QETH_PRIO_Q_ING_SKB   3
+#define QETH_PRIO_Q_ING_VLAN  4
 
 /* 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 dca5161beaed..34993009a9e1 100644
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -3677,12 +3677,9 @@ EXPORT_SYMBOL_GPL(qeth_qdio_output_handler);
 int qeth_get_priority_queue(struct qeth_card *card, struct sk_buff *skb,
                         int ipv, int cast_type)
 {
+        __be16 *tci;
         u8 tos;
 
-        if (!ipv && (card->info.type == QETH_CARD_TYPE_OSD ||
-                     card->info.type == QETH_CARD_TYPE_OSX))
-                return card->qdio.default_out_queue;
-
         if (cast_type && card->info.is_multicast_different)
                 return card->info.is_multicast_different &
                         (card->qdio.no_out_queues - 1);
@@ -3710,6 +3707,16 @@ int qeth_get_priority_queue(struct qeth_card *card, struct sk_buff *skb,
                         return 1;
                 if (tos & IPTOS_LOWDELAY)
                         return 0;
+                break;
+        case QETH_PRIO_Q_ING_SKB:
+                if (skb->priority > 5)
+                        return 0;
+                return ~skb->priority >> 1 & 3;
+        case QETH_PRIO_Q_ING_VLAN:
+                tci = &((struct ethhdr *)skb->data)->h_proto;
+                if (*tci == ETH_P_8021Q)
+                        return ~*(tci + 1) >> (VLAN_PRIO_SHIFT + 1) & 3;
+                break;
         default:
                 break;
         }
diff --git a/drivers/s390/net/qeth_core_sys.c b/drivers/s390/net/qeth_core_sys.c
index 8547de8a766c..8a25a2be9890 100644
--- a/drivers/s390/net/qeth_core_sys.c
+++ b/drivers/s390/net/qeth_core_sys.c
@@ -217,6 +217,10 @@ static ssize_t qeth_dev_prioqing_show(struct device *dev,
                 return sprintf(buf, "%s\n", "by precedence");
         case QETH_PRIO_Q_ING_TOS:
                 return sprintf(buf, "%s\n", "by type of service");
+        case QETH_PRIO_Q_ING_SKB:
+                return sprintf(buf, "%s\n", "by skb-priority");
+        case QETH_PRIO_Q_ING_VLAN:
+                return sprintf(buf, "%s\n", "by VLAN headers");
         default:
                 return sprintf(buf, "always queue %i\n",
                                card->qdio.default_out_queue);
@@ -253,9 +257,19 @@ static ssize_t qeth_dev_prioqing_store(struct device *dev,
         if (!strcmp(tmp, "prio_queueing_prec")) {
                 card->qdio.do_prio_queueing = QETH_PRIO_Q_ING_PREC;
                 card->qdio.default_out_queue = QETH_DEFAULT_QUEUE;
+        } else if (!strcmp(tmp, "prio_queueing_skb")) {
+                card->qdio.do_prio_queueing = QETH_PRIO_Q_ING_SKB;
+                card->qdio.default_out_queue = QETH_DEFAULT_QUEUE;
         } else if (!strcmp(tmp, "prio_queueing_tos")) {
                 card->qdio.do_prio_queueing = QETH_PRIO_Q_ING_TOS;
                 card->qdio.default_out_queue = QETH_DEFAULT_QUEUE;
+        } else if (!strcmp(tmp, "prio_queueing_vlan")) {
+                if (!card->options.layer2) {
+                        rc = -ENOTSUPP;
+                        goto out;
+                }
+                card->qdio.do_prio_queueing = QETH_PRIO_Q_ING_VLAN;
+                card->qdio.default_out_queue = QETH_DEFAULT_QUEUE;
         } else if (!strcmp(tmp, "no_prio_queueing:0")) {
                 card->qdio.do_prio_queueing = QETH_NO_PRIO_QUEUEING;
                 card->qdio.default_out_queue = 0;