summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-01-12 03:10:12 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-01-12 03:10:12 +0000
commit82c39af536169cfc9e476ff66aa7bcd90a346bb7 (patch)
tree7981d9f04b1519f29cf8e715b7872d283b09ed1c
parent5c8a4212a704139521c9ab8cc9cd7e52fc645ed6 (diff)
mac80211: another minor fix to monitor mode queue selection
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19111 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/mac80211/patches/570-monitor_queue_select_fix.patch18
1 files changed, 18 insertions, 0 deletions
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 000000000..fc186c52a
--- /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;