summaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/600-monitor_select_queue_fix.patch
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-01-12 03:10:03 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-01-12 03:10:03 +0000
commit5c8a4212a704139521c9ab8cc9cd7e52fc645ed6 (patch)
tree01eeb6acfb6bdb960509b63b891ec66a90e10f3c /package/mac80211/patches/600-monitor_select_queue_fix.patch
parent0b686a0ab95aca103224dcbed2e48e6722f07452 (diff)
mac80211: upgrade to a new unofficial snapshot based on wireless-testing+wireless-2.6
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19110 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/600-monitor_select_queue_fix.patch')
-rw-r--r--package/mac80211/patches/600-monitor_select_queue_fix.patch26
1 files changed, 0 insertions, 26 deletions
diff --git a/package/mac80211/patches/600-monitor_select_queue_fix.patch b/package/mac80211/patches/600-monitor_select_queue_fix.patch
deleted file mode 100644
index 9a3b1d47f..000000000
--- a/package/mac80211/patches/600-monitor_select_queue_fix.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/net/mac80211/iface.c
-+++ b/net/mac80211/iface.c
-@@ -685,6 +685,7 @@ static u16 ieee80211_monitor_select_queu
- struct ieee80211_local *local = sdata->local;
- struct ieee80211_hdr *hdr;
- struct ieee80211_radiotap_header *rtap = (void *)skb->data;
-+ u8 *p;
-
- if (local->hw.queues < 4)
- return 0;
-@@ -695,11 +696,14 @@ static u16 ieee80211_monitor_select_queu
-
- hdr = (void *)((u8 *)skb->data + le16_to_cpu(rtap->it_len));
-
-- if (!ieee80211_is_data(hdr->frame_control)) {
-+ if (!ieee80211_is_data_qos(hdr->frame_control)) {
- skb->priority = 7;
- return ieee802_1d_to_ac[skb->priority];
- }
-
-+ p = ieee80211_get_qos_ctl(hdr);
-+ skb->priority = *p & IEEE80211_QOS_CTL_TAG1D_MASK;
-+
- return ieee80211_downgrade_queue(local, skb);
- }
-