[PATCH v3] wireless: add check of field VHT Extended NSS BW Capable for 160/80+80 MHz setting

[PATCH v3] wireless: add check of field VHT Extended NSS BW Capable for 160/80+80 MHz setting

[Wen Gong]

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.

This patch is to add check for the subfield.

Signed-off-by: Wen Gong <wgong@codeaurora.org>
---
v3: add __le16_to_cpu for __le16 tx_highest
v2: change code style
 net/wireless/chan.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/net/wireless/chan.c b/net/wireless/chan.c
index 285b8076054b..a2d11c801585 100644
--- a/net/wireless/chan.c
+++ b/net/wireless/chan.c
@@ -942,7 +942,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;
+	bool ext_nss_cap, support_80_80 = false;
 
 	if (WARN_ON(!cfg80211_chandef_valid(chandef)))
 		return false;
@@ -950,6 +950,7 @@ bool cfg80211_chandef_usable(struct wiphy *wiphy,
 	ht_cap = &wiphy->bands[chandef->chan->band]->ht_cap;
 	vht_cap = &wiphy->bands[chandef->chan->band]->vht_cap;
 	edmg_cap = &wiphy->bands[chandef->chan->band]->edmg_cap;
+	ext_nss_cap = __le16_to_cpu(vht_cap->vht_mcs.tx_highest) & IEEE80211_VHT_EXT_NSS_BW_CAPABLE;
 
 	if (edmg_cap->channels &&
 	    !cfg80211_edmg_usable(wiphy,
@@ -1015,7 +1016,8 @@ bool cfg80211_chandef_usable(struct wiphy *wiphy,
 			(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) ||
-			u32_get_bits(cap, IEEE80211_VHT_CAP_EXT_NSS_BW_MASK) > 1;
+			(ext_nss_cap &&
+			 u32_get_bits(cap, IEEE80211_VHT_CAP_EXT_NSS_BW_MASK) > 1);
 		if (chandef->chan->band != NL80211_BAND_6GHZ && !support_80_80)
 			return false;
 		fallthrough;
@@ -1037,7 +1039,7 @@ bool cfg80211_chandef_usable(struct wiphy *wiphy,
 		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 &&
-		    !(vht_cap->cap & IEEE80211_VHT_CAP_EXT_NSS_BW_MASK))
+		    !(ext_nss_cap && (vht_cap->cap & IEEE80211_VHT_CAP_EXT_NSS_BW_MASK)))
 			return false;
 		break;
 	default:
-- 
2.31.1


-- 
ath11k mailing list
ath11k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath11k

Re: Re: [PATCH v3] wireless: add check of field VHT Extended NSS BW Capable for 160/80+80 MHz setting

[Dominik Förderer]

[-- Attachment #1.1: Type: text/plain, Size: 3649 bytes --]

I've tested the patch on an xps13 9310 with a 160MHZ wlanrouter with linux
5.12.10 and linux 5.13 rc5. The connection is up, stable and usable at start and
but after a random number of minutes (normally within the first 5 minutes) the
network connection crashes and it's not possible to connect to any wlan once
again. It's also not possible to reload the ath11k_pci module. Only a restart
will help, but sometimes the notebook freezes entirely.

How can i help to debug this Problem?    


Öffentlicher PGP-Schlüssel:

-----BEGIN PGP PUBLIC KEY BLOCK-----

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
=x/DB
-----END PGP PUBLIC KEY BLOCK-----

[-- Attachment #1.2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[-- Attachment #2: Type: text/plain, Size: 102 bytes --]

-- 
ath11k mailing list
ath11k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath11k