From nobody Wed Sep 21 14:01:14 2022 X-Original-To: dev-commits-src-branches@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 4MXg7G5YjWz4cXrG; Wed, 21 Sep 2022 14:01:14 +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 4MXg7G4dtqz48ZW; Wed, 21 Sep 2022 14:01:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663768874; 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=0o/oR64WNTlFmjOiUSBYzSVApDTyIoIKFeYha4Ph/No=; b=SeccPIF6lHPsv+ogbOl7g0ujy9dvLbTMd6VV4u7DcjJ6QrpmdA8NgSSAJs2k2h2CMM6rgy URzcMQ80mXG1A8Vuhn8EwNd8bXlb7oGk0Rho2uuSHe2zzEdnmcOEucCrHBiY4YDuE5cjjb qgUBHkEhTqgGy2I4OhjW43PSgcba6lhbTlL51pgJm3mE/BwQDmVsjrDF5OC6ea734wYWTe 39luHESJr/CUfBOWq5/vSzAzb8N+5sv9QapzhuBOay+u8J65RELqkx290Mr+4uRGBbSdfM 7nFAL4g8lewMQ1EhF5YABnfTM3h/7+PcZt3EbwRYysz2dxXLikAKcH7igRd6Rg== 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 4MXg7G3dCQz14qS; Wed, 21 Sep 2022 14:01:14 +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 28LE1ER9099789; Wed, 21 Sep 2022 14:01:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28LE1Ev1099788; Wed, 21 Sep 2022 14:01:14 GMT (envelope-from git) Date: Wed, 21 Sep 2022 14:01:14 GMT Message-Id: <202209211401.28LE1Ev1099788@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: f3b255d951db - stable/13 - net80211: change order in ieee80211_vhtchanflags() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: f3b255d951db406b6cb4e8422004b89054ea172d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663768874; 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=0o/oR64WNTlFmjOiUSBYzSVApDTyIoIKFeYha4Ph/No=; b=BjJidVAHQlleH83SyrzLBgm/5i6IDyubpkvVyzO1AMMq4hXMjI3tWRamQAtSwSBbDdd8yv ZOUy8bw7iNhyzrDzcQGjj31hoV0HLzfljhlPq7GOEh3D0TROPaldN3gI+2EbAZkq2oVRPh tG+QN8JxixFCsHHwn4RtNb6CqYuZEh8vm0iTZsZm1k3wa69+zwYXfyr5FO8QP0iq9L73+Q xDMSeKxYC19YQthrHAw9QqNn1j0c9gaul/NwCMrbSMkoXngquQkut02BosQoXyeuE93WxL 0eFoMluwRfGbOLq/5aKtMAVehzCBbUoAS+ZqOXGzM8s2SBFoTCFnUbHaQzi/dw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663768874; a=rsa-sha256; cv=none; b=Oe3WuYB143ugY4NFG0dnGJYDcFOZwbj+MYQ9vYghrVfUpGChSVAqrQIFRSRlzhSZ8wHNIW +/k/7/HXy7wrzuKhVJGnbMtRCUD7zswEOdUrHQ5L/GLdaLVvg881rsz2cGJTPDckB/uvMR Xal7K4HhCE7RQAoJtSkNXzvjTNGgf0Osor4mhZGZBp3HMEEYAKQpsvetRBaBTjkr6v+4XM nXyUaBrSuv9C2rYHUF9sN0AjJCBDCYbzyPQnYu8nWqZ+AaVVsmz+dWIX01MuCra3D8UO4e sLB9tylwIPX5SvsY+Rcq7uBbIsJYEfpm0aYj/bXGwSp+1STpjrNBiK5lmpHWLw== 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=f3b255d951db406b6cb4e8422004b89054ea172d commit f3b255d951db406b6cb4e8422004b89054ea172d Author: Bjoern A. Zeeb AuthorDate: 2022-07-29 00:18:48 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-09-21 11:40:14 +0000 net80211: change order in ieee80211_vhtchanflags() While 80P80 is less likely to be used, VHT160 (a single contiguous width) is harder to acquire but also preferable so return that first. Sponsored by: The FreeBSD Foundation Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D35977 (cherry picked from commit 195733401f431622df3185897cd04c1aeb113e0d) --- sys/net80211/ieee80211_var.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/net80211/ieee80211_var.h b/sys/net80211/ieee80211_var.h index 0a9cd2d876aa..7276f50685fb 100644 --- a/sys/net80211/ieee80211_var.h +++ b/sys/net80211/ieee80211_var.h @@ -937,10 +937,10 @@ static __inline int ieee80211_vhtchanflags(const struct ieee80211_channel *c) { - if (IEEE80211_IS_CHAN_VHT80P80(c)) - return IEEE80211_FVHT_USEVHT80P80; if (IEEE80211_IS_CHAN_VHT160(c)) return IEEE80211_FVHT_USEVHT160; + if (IEEE80211_IS_CHAN_VHT80P80(c)) + return IEEE80211_FVHT_USEVHT80P80; if (IEEE80211_IS_CHAN_VHT80(c)) return IEEE80211_FVHT_USEVHT80; if (IEEE80211_IS_CHAN_VHT40(c))