diff options
author | Felix Fietkau <nbd@openwrt.org> | 2010-01-15 01:16:40 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2010-01-15 01:16:40 +0000 |
commit | 99ae1183d3146aa9c69574028776026f52b29a98 (patch) | |
tree | b87c43a312e236e4de933bf52b058894fd3c0927 /package/mac80211/patches/530-monitor_queue_select_fix.patch | |
parent | 5f4a13fbdb5407738544df1bb29d4220a521bfc4 (diff) | |
download | upstream-99ae1183d3146aa9c69574028776026f52b29a98.tar.gz upstream-99ae1183d3146aa9c69574028776026f52b29a98.tar.bz2 upstream-99ae1183d3146aa9c69574028776026f52b29a98.zip |
mac80211: update to wireless-testing+wireless-2.6 from 2010-01-13
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19139 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/530-monitor_queue_select_fix.patch')
-rw-r--r-- | package/mac80211/patches/530-monitor_queue_select_fix.patch | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/package/mac80211/patches/530-monitor_queue_select_fix.patch b/package/mac80211/patches/530-monitor_queue_select_fix.patch new file mode 100644 index 0000000000..a4fff50283 --- /dev/null +++ b/package/mac80211/patches/530-monitor_queue_select_fix.patch @@ -0,0 +1,18 @@ +--- a/net/mac80211/iface.c ++++ b/net/mac80211/iface.c +@@ -697,10 +697,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; |