From nobody Fri Jul 29 15:15:15 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 4LvWKb6tm0z4XT2y; Fri, 29 Jul 2022 15:15:15 +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 4LvWKb5LF6z3MRB; Fri, 29 Jul 2022 15:15:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659107715; 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=OqLv91L2BqP/dFUYnS6+4NfY91nU9kldPrNxWMj0pgQ=; b=GWCHCSKQ5+n4MxOmRlMTC8mwz1crruVnBtC/w4MJL48t7N6MerFbGokZ8UTdLLLY6dNY0J tD1U+5O4igIrPpgSQWp83Ve6gZDpM5CtD1ulIvwNcX3Lx6fCxBMTSPWd2hAV4S7hSa1mo+ BlV89ocv4KP07N7+erCUwaHrB61tFyQ9xDZcGxsS1KlpKcKcYPzXfKc39/7NgCNW6ENFRk iA+uN6CwVHt4hbRpNm3nTCpu+y3WxXuMC2Lw0yrfcOtvSAC3awW9jQBs4ZnwTH7wFlMCub ahYhtxhuXl9WRsdrg7KqrmoZNvRRYpKta7lbmav2il0dkIwpS1DCbVzo90bjuA== 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 4LvWKb4SLvzg69; Fri, 29 Jul 2022 15:15:15 +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 26TFFF7f037708; Fri, 29 Jul 2022 15:15:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26TFFFSO037707; Fri, 29 Jul 2022 15:15:15 GMT (envelope-from git) Date: Fri, 29 Jul 2022 15:15:15 GMT Message-Id: <202207291515.26TFFFSO037707@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: 195733401f43 - main - net80211: change order in ieee80211_vhtchanflags() 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: 195733401f431622df3185897cd04c1aeb113e0d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659107715; 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=OqLv91L2BqP/dFUYnS6+4NfY91nU9kldPrNxWMj0pgQ=; b=RTUU+KY0tbeRzIjCt2NvzgWNhYGW4v0RrAwwUiHUHrwRptpHkFCt7m+Z69bp7tNR1nHPBd ypTZRwQC4huP98HqrSf4WzYnJv3RAbyNz7KFRdICEcLLE77kWDv68NamWoCb6mXiaryzFy gBDhbg+SoDJdICEeId0xCbvoMv5cbqyKA0i7mnxxwL+qlPSEHSSBTQ65qvY6GM5R8TcGad UtFX8+NV1yb36C7mFcsIo2KqUQSC2jOmzFiGBxF9bSl5zHlbXh+0MHidGkbXGfZDnk+Led xWQ5tW/8T1VYcqczvqtsoiutfGKmTYSR6uO/NeNPUkdpo23wt5U2/s3No1IKfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659107715; a=rsa-sha256; cv=none; b=kyJrv5ub1Eb7645f1hktcetE4rABR08WEQZQAxBZCyi2eA0SKrOCDS3K54VuMky4moqtKR Y3VD+nxPhgMTrHsdeQX8kmc1POpfhjqAl74UwsRFZtzeEhl1WirKy2JRIwre0nR2V+h1Tj 7VJYD/t4U/Ae4wPjJhqjsgLBczg8m9av7a2B8spKk7/4mrxFZy0z5+kqtaBjzY3D42HMGF wv5xgD5zu8+fFPq3HiOxb6Nsh6QQ5X1CEu9LQQegv++rRPuz7MuOcWEv/SHRCPJPF/CXEv m6pAJjtPsniZO5XbSNzVSvLLxI3UhtnDOv2vcSnQOnp7DDLcn8LdsccStVXlrQ== 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=195733401f431622df3185897cd04c1aeb113e0d commit 195733401f431622df3185897cd04c1aeb113e0d Author: Bjoern A. Zeeb AuthorDate: 2022-07-29 00:18:48 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-07-29 15:10:52 +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 MFC after: 1 week Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D35977 --- 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 a96bc6bc4278..6e52eae78dbb 100644 --- a/sys/net80211/ieee80211_var.h +++ b/sys/net80211/ieee80211_var.h @@ -934,10 +934,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))