summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c
diff options
context:
space:
mode:
authorEyal Shapira2013-11-12 21:37:28 +0100
committerEmmanuel Grumbach2013-12-17 18:39:38 +0100
commit183d281d268b92a381d53581415344329fee444d (patch)
tree087cec5aa8abb6165d9d1b55bfd9496f9e48f19a /drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c
parentiwlwifi: mvm: add a generic cipher scheme support (diff)
downloadkernel-qcow2-linux-183d281d268b92a381d53581415344329fee444d.tar.gz
kernel-qcow2-linux-183d281d268b92a381d53581415344329fee444d.tar.xz
kernel-qcow2-linux-183d281d268b92a381d53581415344329fee444d.zip
iwlwifi: publish STBC support in HT
Not all chips support STBC so allow this to be another config parameter per chip type. If STBC is supported then publish it in the HT caps. Since 7260/7265/3160 chips support it - set the stbc support bit. Signed-off-by: Eyal Shapira <eyal@wizery.com> Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c b/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c
index f4a6d317a023..4380c16580eb 100644
--- a/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c
+++ b/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c
@@ -751,6 +751,13 @@ void iwl_init_ht_hw_capab(const struct iwl_cfg *cfg,
ht_info->ht_supported = true;
ht_info->cap = IEEE80211_HT_CAP_DSSSCCK40;
+ if (cfg->ht_params->stbc) {
+ ht_info->cap |= (1 << IEEE80211_HT_CAP_RX_STBC_SHIFT);
+
+ if (tx_chains > 1)
+ ht_info->cap |= IEEE80211_HT_CAP_TX_STBC;
+ }
+
if (iwlwifi_mod_params.amsdu_size_8K)
ht_info->cap |= IEEE80211_HT_CAP_MAX_AMSDU;