From owner-freebsd-current@freebsd.org Mon Mar 29 15:02:38 2021 Return-Path: Delivered-To: freebsd-current@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C74D1579DBA for ; Mon, 29 Mar 2021 15:02:38 +0000 (UTC) (envelope-from 1051244836@qq.com) Received: from qq.com (out162-62-57-64.mail.qq.com [162.62.57.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4F8G5j1jYFz3lw4 for ; Mon, 29 Mar 2021 15:02:32 +0000 (UTC) (envelope-from 1051244836@qq.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1617030141; bh=9KsI5yLZu6AWw+CclvxX37pmgMSLnoLpB8sLxhFlz5U=; h=From:Subject:Date:To; b=gegs/+BAg1tUKh11+YnQ9LipRau/GNtz/HkGFxOlULD9W8ohflToMVVpi5uVdK+tT M7JwCjkuARi7OIiCe6T6fh05hr+AuGx9EmjkBG7ehTwT3B0P7YV6Us5UVQf8nkrLNH 8hAY3TsCZm8AAzoTqDL1LvoTgOtqFD6zEF5k65Fo= Received: from [IPv6:2409:8a55:6e0:e1d1:8180:ff78:27fa:77b7] ([2409:8a55:6e0:e1d1:8180:ff78:27fa:77b7]) by newxmesmtplogicsvrsza6.qq.com (NewEsmtp) with SMTP id 910ECC6; Mon, 29 Mar 2021 23:02:17 +0800 X-QQ-mid: xmsmtpt1617030137th7p7rp6b Message-ID: X-QQ-XMAILINFO: MwE85E2PBvc4IF/x399X9TUhnwugkZCA7LFLxN/yU+ancoUrxXeNGjgtgcY99n XOwEOfE/k9Dr2p+mkzLP7pALy49nDMPdazZPnOR+TQczKbqLnS9Z2Nkg0TKBOM2m3jM6QTZ1apDu VdMPB9U762XNebBLiHKA6D0uqK/2U20sPLAI+CMRd5IjrBDReHVHEMZKWtGQL4cipHNKyhv7Jku1 SNaH49y3fjUN0iUs8KzYl8GLFX3ZcrnlxWb2wRWcT77GeHw/fXVpEfAeNU5bKMUVcsIp+3VHz8sh iF2XIGJEZw1AiStwV8O0wCY45994D6sBoePyRRG0wrVYxKN6CmqSvVd0kL1jWsSvHibsYN9NXrqX YzHggAow+0jtjnrufj8Zhy7fnnK35JTOpY3Fa56DiQoA3BMwKJaS/2kbVDWtRH0fo+M1wunVuos1 3WHPwFX8Ra8k/XCZ3BhUibQZcLFfNntX01AiXTSWpEOQzJhgymuMIfgZM4LmOZGURvebDCSe2LV2 MV3k6fxFS8qT2vG9Rt4FpakQ8GR9VkLcj2dakjmaYF67CYHMPPl0l2Jn3u3wW/BTFHbr3xPl5OuT YEoY8jI4wSDa3Y6r8v2BhQ/K6OgC0rMYCBUAoTE0ax5uvxPJAQLwSmJNXEGNUzA2ddT1sKDrL/tn UyI+4s/ecqT1EWhgCmGViMublFx83eYZq6ei3OCOmfdgAANDEbwJSZTDuDxTmlsvnbqIOgSm1SXt 7dd+P5CpYx+K2mCaJUBEMhkz4MSpTvbIN1 From: qcwap <1051244836@qq.com> Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Mime-Version: 1.0 (Mac OS X Mail 13.4 \(3608.120.23.2.4\)) Subject: Correct net80211 channel flag. X-OQ-MSGID: Date: Mon, 29 Mar 2021 23:02:16 +0800 To: freebsd-current@freebsd.org X-Mailer: Apple Mail (2.3608.120.23.2.4) X-Rspamd-Queue-Id: 4F8G5j1jYFz3lw4 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org; dkim=pass header.d=qq.com header.s=s201512 header.b=gegs/+BA; dmarc=pass (policy=none) header.from=qq.com; spf=pass (mx1.freebsd.org: domain of 1051244836@qq.com designates 162.62.57.64 as permitted sender) smtp.mailfrom=1051244836@qq.com X-Spamd-Result: default: False [-6.50 / 15.00]; FREEMAIL_FROM(0.00)[qq.com]; MV_CASE(0.50)[]; TO_DN_NONE(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:162.62.57.64]; DKIM_TRACE(0.00)[qq.com:+]; DMARC_POLICY_ALLOW(-0.50)[qq.com,none]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[qq.com]; ASN(0.00)[asn:132203, ipnet:162.62.56.0/22, country:CN]; RBL_DBL_DONT_QUERY_IPS(0.00)[162.62.57.64:from]; DWL_DNSWL_NONE(0.00)[qq.com:dkim]; MID_RHS_MATCH_FROM(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[qq.com:s=s201512]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[162.62.57.64:from:127.0.2.255]; WHITELIST_SPF_DKIM(-3.00)[qq.com:d:+,qq.com:s:+]; RCVD_COUNT_TWO(0.00)[2]; MAILMAN_DEST(0.00)[freebsd-current] X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Mar 2021 15:02:38 -0000 This patch corrects ieee80211_vht_get_vhtcap_ie for 160/80P80 channel = width recognition.=20 diff --git a/sys/net80211/ieee80211.h b/sys/net80211/ieee80211.h index 86ab1459cca..76c43629b33 100644 --- a/sys/net80211/ieee80211.h +++ b/sys/net80211/ieee80211.h @@ -811,9 +811,9 @@ struct ieee80211_ie_vht_operation { #define IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_MASK 0x0000000C #define IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_MASK_S 2 #define IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_NONE 0 -#define IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_160MHZ 1 -#define IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_160_80P80MHZ 2 -#define IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_RESERVED 3 +#define IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_160MHZ 4 +#define IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_160_80P80MHZ 8 +#define IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_RESERVED 16 =20 #define IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_IS_160MHZ(_vhtcaps) = \ (_IEEE80211_MASKSHIFT(_vhtcaps, = IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_MASK) >=3D \