diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2010-01-11 05:57:59 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2010-01-11 05:57:59 +0000 |
| commit | a0f378097ed829d3fb71d6f9c0e1ebe8a795395d (patch) | |
| tree | e397e4369ed2c5de60eeb23021c1d80c5bd12c24 /package | |
| parent | 541158d5ad4a941d927a397737b6588d2e4db22d (diff) | |
| download | upstream-a0f378097ed829d3fb71d6f9c0e1ebe8a795395d.tar.gz upstream-a0f378097ed829d3fb71d6f9c0e1ebe8a795395d.tar.bz2 upstream-a0f378097ed829d3fb71d6f9c0e1ebe8a795395d.zip | |
mac80211: fix some monitor mode queue selection bugs
SVN-Revision: 19099
Diffstat (limited to 'package')
| -rw-r--r-- | package/mac80211/patches/590-endian_fix.patch | 15 | ||||
| -rw-r--r-- | package/mac80211/patches/600-monitor_select_queue_fix.patch | 26 |
2 files changed, 41 insertions, 0 deletions
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); + } + |