From: Felix Fietkau <nbd@openwrt.org>
Date: Tue, 12 Jan 2010 03:10:12 +0000 (+0000)
Subject: mac80211: another minor fix to monitor mode queue selection
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;hb=782bceba828c9c12880696c5bf737beaa1b3147d

mac80211: another minor fix to monitor mode queue selection

SVN-Revision: 19111
---

diff --git a/package/mac80211/patches/570-monitor_queue_select_fix.patch b/package/mac80211/patches/570-monitor_queue_select_fix.patch
new file mode 100644
index 0000000000..fc186c52a1
--- /dev/null
+++ b/package/mac80211/patches/570-monitor_queue_select_fix.patch
@@ -0,0 +1,18 @@
+--- a/net/mac80211/iface.c
++++ b/net/mac80211/iface.c
+@@ -696,10 +696,14 @@ static u16 ieee80211_monitor_select_queu
+ 
+ 	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;