Date:2010-01-11 06:57:59 (3 years 4 months ago)
Author:nbd
Commit:eb55ef86f3319c0f08b72fc8dbac1377c2a1dae2
Message:mac80211: fix some monitor mode queue selection bugs

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19099 3c298f89-4303-0410-b956-a3cf2f4a3e73
Files: package/mac80211/patches/590-endian_fix.patch (1 diff)
package/mac80211/patches/600-monitor_select_queue_fix.patch (1 diff)

Change Details

package/mac80211/patches/590-endian_fix.patch
1--- a/net/mac80211/iface.c
2@@ -690,10 +690,10 @@ static u16 ieee80211_monitor_select_queu
3         return 0;
4
5     if (skb->len < 4 ||
6- skb->len < rtap->it_len + 2 /* frame control */)
7+ skb->len < le16_to_cpu(rtap->it_len) + 2 /* frame control */)
8         return 0; /* doesn't matter, frame will be dropped */
9
10- hdr = (void *)((u8 *)skb->data + rtap->it_len);
11+ hdr = (void *)((u8 *)skb->data + le16_to_cpu(rtap->it_len));
12
13     if (!ieee80211_is_data(hdr->frame_control)) {
14         skb->priority = 7;
package/mac80211/patches/600-monitor_select_queue_fix.patch
1--- a/net/mac80211/iface.c
2@@ -685,6 +685,7 @@ static u16 ieee80211_monitor_select_queu
3     struct ieee80211_local *local = sdata->local;
4     struct ieee80211_hdr *hdr;
5     struct ieee80211_radiotap_header *rtap = (void *)skb->data;
6+ u8 *p;
7
8     if (local->hw.queues < 4)
9         return 0;
10@@ -695,11 +696,14 @@ static u16 ieee80211_monitor_select_queu
11
12     hdr = (void *)((u8 *)skb->data + le16_to_cpu(rtap->it_len));
13
14- if (!ieee80211_is_data(hdr->frame_control)) {
15+ if (!ieee80211_is_data_qos(hdr->frame_control)) {
16         skb->priority = 7;
17         return ieee802_1d_to_ac[skb->priority];
18     }
19
20+ p = ieee80211_get_qos_ctl(hdr);
21+ skb->priority = *p & IEEE80211_QOS_CTL_TAG1D_MASK;
22+
23     return ieee80211_downgrade_queue(local, skb);
24 }
25

Archive Download the corresponding diff file



interactive