mac80211: fix WMM AC default for non-QoS data frames (861a57cd) · Commits · 戴 / test

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> Signed-off-by:

John W. Linville <linville@tuxdriver.com>

net/mac80211/iface.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -695,10 +695,14 @@ static u16 ieee80211_monitor_select_queue(struct net_device *dev,

		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;

Admin message