The branch stable/13 has been updated by bz:

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

commit f3b255d951db406b6cb4e8422004b89054ea172d
Author:     Bjoern A. Zeeb <[email protected]>
AuthorDate: 2022-07-29 00:18:48 +0000
Commit:     Bjoern A. Zeeb <[email protected]>
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))

Reply via email to