On 2020-08-26 22:31, Shay Bar wrote:
Fix cfg80211_chandef_usable():
consider IEEE80211_VHT_CAP_EXT_NSS_BW when verifying 160/80+80 MHz.
Based on:
"Table 9-272 — Setting of the Supported Channel Width Set subfield and
Extended NSS BW
Support subfield at a STA transmitting the VHT Capabilities Information
field"
From "Draft P802.11REVmd_D3.0.pdf"
Signed-off-by: Aviad Brikman <aviad.brikman@xxxxxxxxxx>
Signed-off-by: Shay Bar <shay.bar@xxxxxxxxxx>
---
net/wireless/chan.c | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/net/wireless/chan.c b/net/wireless/chan.c
index 90f0f82cd9ca..a51d11d3be33 100644
--- a/net/wireless/chan.c
+++ b/net/wireless/chan.c
@@ -912,6 +912,7 @@ bool cfg80211_chandef_usable(struct wiphy *wiphy,
struct ieee80211_sta_vht_cap *vht_cap;
struct ieee80211_edmg *edmg_cap;
u32 width, control_freq, cap;
+ bool support_80_80 = false;
if (WARN_ON(!cfg80211_chandef_valid(chandef)))
return false;
@@ -979,9 +980,16 @@ bool cfg80211_chandef_usable(struct wiphy *wiphy,
return false;
break;
case NL80211_CHAN_WIDTH_80P80:
- cap = vht_cap->cap &
IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_MASK;
+ cap = vht_cap->cap;
+ support_80_80 =
+ ((cap &
+
IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160_80PLUS80MHZ) ||
+ (cap & IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160MHZ
&&
+ cap & IEEE80211_VHT_CAP_EXT_NSS_BW_MASK) ||
+ ((cap & IEEE80211_VHT_CAP_EXT_NSS_BW_MASK) >>
+ IEEE80211_VHT_CAP_EXT_NSS_BW_SHIFT
> 1));
if (chandef->chan->band != NL80211_BAND_6GHZ &&
- cap !=
IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160_80PLUS80MHZ)
+ !support_80_80)
return false;
/* fall through */
case NL80211_CHAN_WIDTH_80:
@@ -1001,7 +1009,8 @@ bool cfg80211_chandef_usable(struct wiphy *wiphy,
return false;
cap = vht_cap->cap &
IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_MASK;
if (cap != IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160MHZ &&
- cap !=
IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160_80PLUS80MHZ)
+ cap !=
IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160_80PLUS80MHZ &&
+ !(vht_cap->cap &
IEEE80211_VHT_CAP_EXT_NSS_BW_MASK))
return false;
in Table 9-251—Supported VHT-MCS and NSS Set subfields, it has Subfield
VHT Extended
NSS BW Capable, its Definition is:
Indicates whether the STA is capable of
interpreting the Extended NSS BW
Support subfield of the VHT Capabilities
Information field
so it should check the Subfield VHT Extended NSS BW Capable in
vht_cap->vht_mcs firstly, if
it is 0, then not allowed to check IEEE80211_VHT_CAP_EXT_NSS_BW_MASK of
vht_cap->cap.
please correct me if wrong.
break;
default:
--
2.17.1
________________________________
The information transmitted is intended only for the person or entity
to which it is addressed and may contain confidential and/or
privileged material. Any retransmission, dissemination, copying or
other use of, or taking of any action in reliance upon this
information is prohibited. If you received this in error, please
contact the sender and delete the material from any computer. Nothing
contained herein shall be deemed as a representation, warranty or a
commitment by Celeno. No warranties are expressed or implied,
including, but not limited to, any implied warranties of
non-infringement, merchantability and fitness for a particular
purpose.
________________________________
