aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjoern A. Zeeb <bz@FreeBSD.org>2022-09-26 20:57:41 +0000
committerBjoern A. Zeeb <bz@FreeBSD.org>2022-10-17 20:37:05 +0000
commit342b7b5f00fe3bea1e7c461ab348c69dacb0ca9e (patch)
treeda7a3fb52f13a243a96d8fd165740f7bdbff9c01
parentceee152257810d8379fe51c989f2b81c066cdd6e (diff)
downloadsrc-342b7b5f00fe3bea1e7c461ab348c69dacb0ca9e.tar.gz
src-342b7b5f00fe3bea1e7c461ab348c69dacb0ca9e.zip
net80211: move IEEE80211_F_WME check to vap for consistency
The IEEE80211_F_WME checks done on the ic were changed to be per-vap back in the time when multi-bss was introduced or earlier in 2008. This one was left out but given it is a (re-)accos-req case I see no reason not to use the vap value here for consistency too. Sponsored by: The FreeBSD Foundation Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D36733 (cherry picked from commit f82316f67883b53ee0f79bf28be32dfa7d64d5e3)
-rw-r--r--sys/net80211/ieee80211_output.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/net80211/ieee80211_output.c b/sys/net80211/ieee80211_output.c
index 35f386eda27f..48cdcbe4f773 100644
--- a/sys/net80211/ieee80211_output.c
+++ b/sys/net80211/ieee80211_output.c
@@ -2896,7 +2896,7 @@ ieee80211_send_mgmt(struct ieee80211_node *ni, int type, int arg)
}
frm = ieee80211_add_wpa(frm, vap);
- if ((ic->ic_flags & IEEE80211_F_WME) &&
+ if ((vap->iv_flags & IEEE80211_F_WME) &&
ni->ni_ies.wme_ie != NULL)
frm = ieee80211_add_wme_info(frm, &ic->ic_wme, ni);