Skip to contentSkip to conversation

mac80211: fix WMM AC default for non-QoS data frames

PATCH In review Felix Fietkau 3 participants 3 messages Jan 12, 2010 mac80211

lore
Share & tools
lore

Felix Fietkau

author
#0 lore raw

PATCH 1/1 mac80211: fix WMM AC default for non-QoS data frames

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 <[email protected]>

---

net/mac80211/iface.c +5 -1
@@ -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;
#1 lore raw
Quoted 6 lines · Felix Fietkau

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 <[email protected]>

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

#2 lore raw
Quoted 11 lines · Luis R. Rodriguez
Quoted 6 lines · Felix Fietkau

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 <[email protected]>

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

Signature · 2 lines
John W. Linville		Someday the world will need a hero, and you
[email protected]			might be all we have.  Be ready.