aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/iface.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/mac80211/iface.c')
-rw-r--r--net/mac80211/iface.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index d62ec0803bec..32abae3ce32a 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -670,6 +670,7 @@ static u16 ieee80211_monitor_select_queue(struct net_device *dev,
670 struct ieee80211_local *local = sdata->local; 670 struct ieee80211_local *local = sdata->local;
671 struct ieee80211_hdr *hdr; 671 struct ieee80211_hdr *hdr;
672 struct ieee80211_radiotap_header *rtap = (void *)skb->data; 672 struct ieee80211_radiotap_header *rtap = (void *)skb->data;
673 u8 *p;
673 674
674 if (local->hw.queues < 4) 675 if (local->hw.queues < 4)
675 return 0; 676 return 0;
@@ -680,12 +681,14 @@ static u16 ieee80211_monitor_select_queue(struct net_device *dev,
680 681
681 hdr = (void *)((u8 *)skb->data + le16_to_cpu(rtap->it_len)); 682 hdr = (void *)((u8 *)skb->data + le16_to_cpu(rtap->it_len));
682 683
683 if (!ieee80211_is_data(hdr->frame_control)) { 684 if (!ieee80211_is_data_qos(hdr->frame_control)) {
684 skb->priority = 7; 685 skb->priority = 7;
685 return ieee802_1d_to_ac[skb->priority]; 686 return ieee802_1d_to_ac[skb->priority];
686 } 687 }
687 688
688 skb->priority = 0; 689 p = ieee80211_get_qos_ctl(hdr);
690 skb->priority = *p & IEEE80211_QOS_CTL_TAG1D_MASK;
691
689 return ieee80211_downgrade_queue(local, skb); 692 return ieee80211_downgrade_queue(local, skb);
690} 693}
691 694