diff options
| author | Johannes Berg | 2012-05-21 20:03:01 +0200 |
|---|---|---|
| committer | Johannes Berg | 2012-06-06 13:21:16 +0200 |
| commit | d370493f9be79530950dfab23b980ce60bc84f34 (patch) | |
| tree | 4be4bec91797f5becbc516c9cfeb42111118a6f4 /drivers/net/wireless/iwlwifi/dvm/main.c | |
| parent | iwlwifi: unify tx_chains_num setting (diff) | |
| download | kernel-qcow2-linux-d370493f9be79530950dfab23b980ce60bc84f34.tar.gz kernel-qcow2-linux-d370493f9be79530950dfab23b980ce60bc84f34.tar.xz kernel-qcow2-linux-d370493f9be79530950dfab23b980ce60bc84f34.zip | |
iwlwifi: move ht40 bitmap into config
There's no need to dynamically fill the HT40
band bitmap as it's a device parameter, just
put it into the HT configuration.
Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/dvm/main.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/dvm/main.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/main.c b/drivers/net/wireless/iwlwifi/dvm/main.c index d67ae99c00b9..441188725985 100644 --- a/drivers/net/wireless/iwlwifi/dvm/main.c +++ b/drivers/net/wireless/iwlwifi/dvm/main.c @@ -1157,16 +1157,19 @@ static void iwl_init_ht_hw_capab(const struct iwl_priv *priv, u8 tx_chains_num = priv->hw_params.tx_chains_num; ht_info->cap = 0; + ht_info->ht_supported = false; memset(&ht_info->mcs, 0, sizeof(ht_info->mcs)); + if (!priv->cfg->ht_params) + return; + ht_info->ht_supported = true; - if (priv->cfg->ht_params && - priv->cfg->ht_params->ht_greenfield_support) + if (priv->cfg->ht_params->ht_greenfield_support) ht_info->cap |= IEEE80211_HT_CAP_GRN_FLD; ht_info->cap |= IEEE80211_HT_CAP_SGI_20; max_bit_rate = MAX_BIT_RATE_20_MHZ; - if (priv->hw_params.ht40_channel & BIT(band)) { + if (priv->cfg->ht_params->ht40_bands & BIT(band)) { ht_info->cap |= IEEE80211_HT_CAP_SUP_WIDTH_20_40; ht_info->cap |= IEEE80211_HT_CAP_SGI_40; ht_info->mcs.rx_mask[4] = 0x01; |