OSDN Git Service

mac80211: vht: add support VHT EXT NSS BW in parsing VHT
authorMordechay Goodstein <mordechay.goodstein@intel.com>
Fri, 30 Aug 2019 11:40:57 +0000 (14:40 +0300)
committerJohannes Berg <johannes.berg@intel.com>
Wed, 11 Sep 2019 07:13:03 +0000 (09:13 +0200)
This fixes was missed in parsing the vht capabilities max bw
support.

Signed-off-by: Mordechay Goodstein <mordechay.goodstein@intel.com>
Fixes: e80d642552a3 ("mac80211: copy VHT EXT NSS BW Support/Capable data to station")
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/20190830114057.22197-1-luca@coelho.fi
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
net/mac80211/vht.c

index b20ff28..ccdcb9a 100644 (file)
@@ -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 <linux/ieee80211.h>
@@ -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;
 }