mac80211: update to wireless-testing+wireless-2.6 from 2010-01-13
[openwrt/svn-archive/archive.git] / package / mac80211 / patches / 530-monitor_queue_select_fix.patch
1 --- a/net/mac80211/iface.c
2 +++ b/net/mac80211/iface.c
3 @@ -697,10 +697,14 @@ static u16 ieee80211_monitor_select_queu
4
5 hdr = (void *)((u8 *)skb->data + le16_to_cpu(rtap->it_len));
6
7 - if (!ieee80211_is_data_qos(hdr->frame_control)) {
8 + if (!ieee80211_is_data(hdr->frame_control)) {
9 skb->priority = 7;
10 return ieee802_1d_to_ac[skb->priority];
11 }
12 + if (!ieee80211_is_data_qos(hdr->frame_control)) {
13 + skb->priority = 0;
14 + return ieee802_1d_to_ac[skb->priority];
15 + }
16
17 p = ieee80211_get_qos_ctl(hdr);
18 skb->priority = *p & IEEE80211_QOS_CTL_TAG1D_MASK;