2010-01-12 11:10:12 +08:00
|
|
|
--- a/net/mac80211/iface.c
|
|
|
|
|
+++ b/net/mac80211/iface.c
|
2010-01-15 09:16:40 +08:00
|
|
|
@@ -697,10 +697,14 @@ static u16 ieee80211_monitor_select_queu
|
2010-01-12 11:10:12 +08:00
|
|
|
|
|
|
|
|
hdr = (void *)((u8 *)skb->data + le16_to_cpu(rtap->it_len));
|
|
|
|
|
|
|
|
|
|
- if (!ieee80211_is_data_qos(hdr->frame_control)) {
|
|
|
|
|
+ if (!ieee80211_is_data(hdr->frame_control)) {
|
|
|
|
|
skb->priority = 7;
|
|
|
|
|
return ieee802_1d_to_ac[skb->priority];
|
|
|
|
|
}
|
|
|
|
|
+ if (!ieee80211_is_data_qos(hdr->frame_control)) {
|
|
|
|
|
+ skb->priority = 0;
|
|
|
|
|
+ return ieee802_1d_to_ac[skb->priority];
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
|
|
p = ieee80211_get_qos_ctl(hdr);
|
|
|
|
|
skb->priority = *p & IEEE80211_QOS_CTL_TAG1D_MASK;
|
