git: 342b7b5f00fe - stable/13 - net80211: move IEEE80211_F_WME check to vap for consistency

From: Bjoern A. Zeeb <bz_at_FreeBSD.org>
Date: Mon, 17 Oct 2022 20:41:45 UTC
The branch stable/13 has been updated by bz:

URL: https://cgit.FreeBSD.org/src/commit/?id=342b7b5f00fe3bea1e7c461ab348c69dacb0ca9e

commit 342b7b5f00fe3bea1e7c461ab348c69dacb0ca9e
Author:     Bjoern A. Zeeb <bz@FreeBSD.org>
AuthorDate: 2022-09-26 20:57:41 +0000
Commit:     Bjoern A. Zeeb <bz@FreeBSD.org>
CommitDate: 2022-10-17 20:37:05 +0000

    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)
---
 sys/net80211/ieee80211_output.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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);