linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] mac80211: fix WMM AC default for non-QoS data frames
@ 2010-01-12  3:08 Felix Fietkau
  2010-01-12 16:52 ` Luis R. Rodriguez
  0 siblings, 1 reply; 3+ messages in thread
From: Felix Fietkau @ 2010-01-12  3:08 UTC (permalink / raw)
  To: linux-wireless; +Cc: Johannes Berg, John W. Linville

The WMM AC selection added to the monitor mode selection function 
accidentally assigns non-QoS data frames to the same AC as mgmt frames 
(VO). This is not serious, but should be fixed anyway. This patch 
assigns them to the BE AC instead.

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
---
--- 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;

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] mac80211: fix WMM AC default for non-QoS data frames
  2010-01-12  3:08 [PATCH] mac80211: fix WMM AC default for non-QoS data frames Felix Fietkau
@ 2010-01-12 16:52 ` Luis R. Rodriguez
  2010-01-12 17:09   ` John W. Linville
  0 siblings, 1 reply; 3+ messages in thread
From: Luis R. Rodriguez @ 2010-01-12 16:52 UTC (permalink / raw)
  To: Felix Fietkau, John W. Linville; +Cc: linux-wireless, Johannes Berg

On Mon, Jan 11, 2010 at 7:08 PM, Felix Fietkau <nbd@openwrt.org> wrote:
> The WMM AC selection added to the monitor mode selection function
> accidentally assigns non-QoS data frames to the same AC as mgmt frames
> (VO). This is not serious, but should be fixed anyway. This patch
> assigns them to the BE AC instead.
>
> Signed-off-by: Felix Fietkau <nbd@openwrt.org>

This one I guess is the one I mean John. Someone correct me if I'm
wrong but I believe this piggy backs on top of all the recent fixes
and is a stable candidate.

  Luis

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] mac80211: fix WMM AC default for non-QoS data frames
  2010-01-12 16:52 ` Luis R. Rodriguez
@ 2010-01-12 17:09   ` John W. Linville
  0 siblings, 0 replies; 3+ messages in thread
From: John W. Linville @ 2010-01-12 17:09 UTC (permalink / raw)
  To: Luis R. Rodriguez; +Cc: Felix Fietkau, linux-wireless, Johannes Berg

On Tue, Jan 12, 2010 at 08:52:32AM -0800, Luis R. Rodriguez wrote:
> On Mon, Jan 11, 2010 at 7:08 PM, Felix Fietkau <nbd@openwrt.org> wrote:
> > The WMM AC selection added to the monitor mode selection function
> > accidentally assigns non-QoS data frames to the same AC as mgmt frames
> > (VO). This is not serious, but should be fixed anyway. This patch
> > assigns them to the BE AC instead.
> >
> > Signed-off-by: Felix Fietkau <nbd@openwrt.org>
> 
> This one I guess is the one I mean John. Someone correct me if I'm
> wrong but I believe this piggy backs on top of all the recent fixes
> and is a stable candidate.

It's not marked for stable.  The "This is not serious..." in the
changelog was non-motivational in that regard. :-)

John
-- 
John W. Linville		Someday the world will need a hero, and you
linville@tuxdriver.com			might be all we have.  Be ready.

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2010-01-12 17:15 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-01-12  3:08 [PATCH] mac80211: fix WMM AC default for non-QoS data frames Felix Fietkau
2010-01-12 16:52 ` Luis R. Rodriguez
2010-01-12 17:09   ` John W. Linville

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).