From: Felix Fietkau <nbd@openwrt.org>
Date: Mon, 11 Jan 2010 05:57:59 +0000 (+0000)
Subject: mac80211: fix some monitor mode queue selection bugs
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a0f378097ed829d3fb71d6f9c0e1ebe8a795395d;p=openwrt%2Fstaging%2Fblocktrron.git

mac80211: fix some monitor mode queue selection bugs

SVN-Revision: 19099
---

diff --git a/package/mac80211/patches/590-endian_fix.patch b/package/mac80211/patches/590-endian_fix.patch
new file mode 100644
index 0000000000..9381a6f431
--- /dev/null
+++ b/package/mac80211/patches/590-endian_fix.patch
@@ -0,0 +1,15 @@
+--- a/net/mac80211/iface.c
++++ b/net/mac80211/iface.c
+@@ -690,10 +690,10 @@ static u16 ieee80211_monitor_select_queu
+ 		return 0;
+ 
+ 	if (skb->len < 4 ||
+-	    skb->len < rtap->it_len + 2 /* frame control */)
++	    skb->len < le16_to_cpu(rtap->it_len) + 2 /* frame control */)
+ 		return 0; /* doesn't matter, frame will be dropped */
+ 
+-	hdr = (void *)((u8 *)skb->data + rtap->it_len);
++	hdr = (void *)((u8 *)skb->data + le16_to_cpu(rtap->it_len));
+ 
+ 	if (!ieee80211_is_data(hdr->frame_control)) {
+ 		skb->priority = 7;
diff --git a/package/mac80211/patches/600-monitor_select_queue_fix.patch b/package/mac80211/patches/600-monitor_select_queue_fix.patch
new file mode 100644
index 0000000000..9a3b1d47f9
--- /dev/null
+++ b/package/mac80211/patches/600-monitor_select_queue_fix.patch
@@ -0,0 +1,26 @@
+--- 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);
+ }
+