From nobody Thu Sep 29 12:57:13 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MdYKj5Pq7z4cnMb; Thu, 29 Sep 2022 12:57:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MdYKj4vwCz3dGc; Thu, 29 Sep 2022 12:57:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664456233; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2to/4zX8ipUe4isiQpHhnfDE7iJFI+YgSMAZEClBC4Q=; b=k4vacuB2gZlA5UJV2EF1d8rWENqzW3MuKAmelX1v+ZqDqbqq7w+Lsqj59dkt4MjUHLpQNV MV8i+DnYr5PMs/gTeUkDGep2GyOBU+YBgdrbECfpeTYYy2qlcX9/dYnfND5PZPoeqFCH0/ V1uQioca8eLYJFSw18z9xPC21Rgpx3STPWuKm9P5LyBVYUIp+ISnU3c6nTGgtpsM3zm/5+ nX2815IaWCI/YMJSnjicGCbglkdK9y3zzDMqMnm4eurFIHwj8Mjl0RvzvLoP4JexOUm684 pew4eGbrUgKE3GWMuzHQQpBJ2hNzmxpQdeqsaGwuOlDP3xLEH28d25A+hwL5Gw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MdYKj3yj9zq0Z; Thu, 29 Sep 2022 12:57:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 28TCvDqx015878; Thu, 29 Sep 2022 12:57:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28TCvDY2015877; Thu, 29 Sep 2022 12:57:13 GMT (envelope-from git) Date: Thu, 29 Sep 2022 12:57:13 GMT Message-Id: <202209291257.28TCvDY2015877@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: f82316f67883 - main - net80211: move IEEE80211_F_WME check to vap for consistency List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f82316f67883b53ee0f79bf28be32dfa7d64d5e3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664456233; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2to/4zX8ipUe4isiQpHhnfDE7iJFI+YgSMAZEClBC4Q=; b=te5E8XY8ECN0d1zsQ5aW3VBjO9vHjE4tfQUmpoKAZac/V9o3tWPajThiJOdVT7blvoMeuK yf9kQdL009B1U/kumiREouwd34hL8jMXtOEKcRK+V8XrD/Jr92DTm8ejdF/0DkFxSHZ2/H aYBArb3hGjZneNmDLrL8aTn845s4vMI4Mw72Suc4TzYmX58ckHN8oVXCjKRP3zgojH9b7H UmWdkPw264kqzAwoYT/fRCdexAFN8ZdEODp2x+BPxAWQMtRWnvp5aMTGYz6DqLqrEg31Pz U4z9/Sfm5NVQACwF2syIGQa1eWzjjQGncByiVKoKJvYHXAflBRAN+SYCXfT+YA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664456233; a=rsa-sha256; cv=none; b=KAVDgrb/VazTcLWdiD4/aI58dclvS79mz+RXtxbevy68GKdFADO2ezNPL8fqMzLsDz6iDK 6z4G7xnCh2Q832O0k0LEg8SbbmdmhYmrIUezU42KD2bGyo3Vs9oSOKKlKzwEjEGFkpQYnG RfWA3ZuJ2plJLusA1YFWysYosGul6pEM9mlHRsNlbNRO1JVOestcGg8lmDyoE8/90NTdir q5CieOcXKcyiU+bNL3n/AZXDOl6EKoUvmQvZoUbUEAtNsFp+TLXhr3K7LPgEYfBFA2Cy1t 1Z0HCYxAR0cG5tK3kdJXEVZFgVNinsm4oOa27tQmQv4JC6QZ01MMEyG/CsQKEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=f82316f67883b53ee0f79bf28be32dfa7d64d5e3 commit f82316f67883b53ee0f79bf28be32dfa7d64d5e3 Author: Bjoern A. Zeeb AuthorDate: 2022-09-26 20:57:41 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-09-29 12:54:23 +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 MFC after: 1 week Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D36733 --- 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 c24ce3981b20..07cc8ed1c3ed 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);