mac80211: update to wireless-testing+wireless-2.6 from 2010-01-13

[openwrt-10.03/.git] / package / mac80211 / patches / 570-monitor_queue_select_fix.patch

diff --git a/package/mac80211/patches/570-monitor_queue_select_fix.patch b/package/mac80211/patches/570-monitor_queue_select_fix.patch
deleted file mode 100644 (file)
index fc186c5..0000000
--- a/package/mac80211/patches/570-monitor_queue_select_fix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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;