26 lines
749 B
Diff
26 lines
749 B
Diff
--- a/net/mac80211/iface.c
|
|
+++ b/net/mac80211/iface.c
|
|
@@ -685,6 +685,7 @@ static u16 ieee80211_monitor_select_queu
|
|
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;
|
|
@@ -695,11 +696,14 @@ static u16 ieee80211_monitor_select_queu
|
|
|
|
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);
|
|
}
|
|
|