From: Mordechay Goodstein Date: Fri, 30 Aug 2019 11:40:57 +0000 (+0300) Subject: mac80211: vht: add support VHT EXT NSS BW in parsing VHT X-Git-Tag: for-linus-2019-09-27~91^2~39^2~11 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=e5c0b0fff6b19238eb0f33ec58247db3e5295cdd;p=linux-2.6-block.git mac80211: vht: add support VHT EXT NSS BW in parsing VHT This fixes was missed in parsing the vht capabilities max bw support. Signed-off-by: Mordechay Goodstein Fixes: e80d642552a3 ("mac80211: copy VHT EXT NSS BW Support/Capable data to station") Signed-off-by: Luca Coelho Link: https://lore.kernel.org/r/20190830114057.22197-1-luca@coelho.fi Signed-off-by: Johannes Berg --- diff --git a/net/mac80211/vht.c b/net/mac80211/vht.c index b20ff28d9f30..ccdcb9ad9ac7 100644 --- a/net/mac80211/vht.c +++ b/net/mac80211/vht.c @@ -4,7 +4,7 @@ * * Portions of this file * Copyright(c) 2015 - 2016 Intel Deutschland GmbH - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018 - 2019 Intel Corporation */ #include @@ -349,6 +349,14 @@ enum ieee80211_sta_rx_bandwidth ieee80211_sta_cap_rx_bw(struct sta_info *sta) cap_width == IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160_80PLUS80MHZ) return IEEE80211_STA_RX_BW_160; + /* + * If this is non-zero, then it does support 160 MHz after all, + * in one form or the other. We don't distinguish here (or even + * above) between 160 and 80+80 yet. + */ + if (vht_cap->cap & IEEE80211_VHT_CAP_EXT_NSS_BW_MASK) + return IEEE80211_STA_RX_BW_160; + return IEEE80211_STA_RX_BW_80; }