1 files changed, 7 insertions, 3 deletions

diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index fe140bf033f9..edf21cebeee8 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -684,21 +684,25 @@ static u16 ieee80211_monitor_select_queue(struct net_device *dev,
         struct ieee80211_local *local = sdata->local;
         struct ieee80211_hdr *hdr;
         struct ieee80211_radiotap_header *rtap = (void *)skb->data;
+        u8 *p;
 
         if (local->hw.queues < 4)
                 return 0;
 
         if (skb->len < 4 ||
-            skb->len < rtap->it_len + 2 /* frame control */)
+            skb->len < le16_to_cpu(rtap->it_len) + 2 /* frame control */)
                 return 0; /* doesn't matter, frame will be dropped */
 
-        hdr = (void *)((u8 *)skb->data + rtap->it_len);
+        hdr = (void *)((u8 *)skb->data + le16_to_cpu(rtap->it_len));
 
-        if (!ieee80211_is_data(hdr->frame_control)) {
+        if (!ieee80211_is_data_qos(hdr->frame_control)) {
                 skb->priority = 7;
                 return ieee802_1d_to_ac[skb->priority];
         }
 
+        p = ieee80211_get_qos_ctl(hdr);
+        skb->priority = *p & IEEE80211_QOS_CTL_TAG1D_MASK;
+
         return ieee80211_downgrade_queue(local, skb);
 }