From nobody Mon Oct 17 20:41:45 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 4MrpnP3XWyz4fQnh; Mon, 17 Oct 2022 20:41:45 +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 4MrpnP2wW3z46g9; Mon, 17 Oct 2022 20:41:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666039305; 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=wHtGWpL9cdPiY68JcakclrJSmvV7CHD1z1GsRfAn8T8=; b=wWjwjjhE+PcvzeirfuusRtehjKdY7v1TptNKxjjFwrEcaT6LmrwtQH2iYkWY44UZUYcUJF PtNjpFqy61dYmGCKIdrywad28zEciccDYbI8Rfs82ESR+bk2uOHGnpm8Tq8slaXHLivgQl c3DKcSYcekv/N2Tm2pN+gnOghFELZ6YHiKr6B7M7W6gBNSUQMuqyT2b+5UFPB49c7QgMSv 2jUi95Yapk3rkOQcsibWQeNq6xC9EwBT/3iUfM9Z8w5NmSk/+qe6dfpON+FlpxKRWZAUre 1xKJAsyw0wJJUTWhzOZLB/+YDhYsQTdaHc43cDFpJT3HPg5HXkn3oEJeqsrMmg== 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 4MrpnP1xLPzxKX; Mon, 17 Oct 2022 20:41:45 +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 29HKfj9n096688; Mon, 17 Oct 2022 20:41:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29HKfjJj096687; Mon, 17 Oct 2022 20:41:45 GMT (envelope-from git) Date: Mon, 17 Oct 2022 20:41:45 GMT Message-Id: <202210172041.29HKfjJj096687@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 342b7b5f00fe - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 342b7b5f00fe3bea1e7c461ab348c69dacb0ca9e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666039305; 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=wHtGWpL9cdPiY68JcakclrJSmvV7CHD1z1GsRfAn8T8=; b=nYmsWNWGKPnUij2CSDD7u58ScoozFz6BJQksOGXsZHKIFv3wM9HJOxSaYtcYJbmHy7WQVj hi5jYD+AWh6bxlfSoprZoZWhgE4fsMrsEESsGqNDiY1g/sQAEy0lWrUSBojmycmsxxtnzr hSZd2JYiHq1Zyv/6yDz/1P8A9ndS2oeWXdnWFrLCgkeCiHwTvHMgCG/9cwafg0U/+zLktq dDk02NvKFpUbS5bjsAkZbn+6lpM5n8jMuxoUVpKBB6HAb6NOdWlMtB9dfEaSqHgtyHAE1D Yq6tICw9VorRMJ7vXYItQZCFgKCdYo5hnz317Oi9pj8H4POyRPjHDUKQHCuGcQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666039305; a=rsa-sha256; cv=none; b=w4gbrZ8ORTp1UmUKWD08quYTG9DBJ4vxoJmwgMX0TtkVcvAOAxa+uuW/5QMUxJOUr7iYzH C2KW8urvJYgRTy9+96RsuOqjRdWl7viWpA9gzy3YxURVgOn2IfGCmzbrAsaVYsdocYsv02 Vkv76Cr8X2ucL8U28Ng7Xd5nysMgu8mgIRrWC/vzZcxdE6XWqGuSX9O0Vge2cFf4azL9Gb NtN7p55j4L9/9yINEfOx38flLSzpB8aMyHzjHWiLVT90mrlXjh89/OE5UsbXYUS2eIe79F GoRJa8pxhufWLdtY2PTRq0y7LQnRTi86abAX7IFzkiWHLAnnlLiYNF3JMxslXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=342b7b5f00fe3bea1e7c461ab348c69dacb0ca9e commit 342b7b5f00fe3bea1e7c461ab348c69dacb0ca9e Author: Bjoern A. Zeeb AuthorDate: 2022-09-26 20:57:41 +0000 Commit: Bjoern A. Zeeb 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);