mac80211: fix some monitor mode queue selection bugs
[openwrt/svn-archive/archive.git] / package / mac80211 / patches / 600-monitor_select_queue_fix.patch
1 --- a/net/mac80211/iface.c
2 +++ b/net/mac80211/iface.c
3 @@ -685,6 +685,7 @@ static u16 ieee80211_monitor_select_queu
4 struct ieee80211_local *local = sdata->local;
5 struct ieee80211_hdr *hdr;
6 struct ieee80211_radiotap_header *rtap = (void *)skb->data;
7 + u8 *p;
8
9 if (local->hw.queues < 4)
10 return 0;
11 @@ -695,11 +696,14 @@ static u16 ieee80211_monitor_select_queu
12
13 hdr = (void *)((u8 *)skb->data + le16_to_cpu(rtap->it_len));
14
15 - if (!ieee80211_is_data(hdr->frame_control)) {
16 + if (!ieee80211_is_data_qos(hdr->frame_control)) {
17 skb->priority = 7;
18 return ieee802_1d_to_ac[skb->priority];
19 }
20
21 + p = ieee80211_get_qos_ctl(hdr);
22 + skb->priority = *p & IEEE80211_QOS_CTL_TAG1D_MASK;
23 +
24 return ieee80211_downgrade_queue(local, skb);
25 }
26