iwlwifi: use station HT capabilities and BSS operating mode for Green-field
Green-field mode should be configured in the HT station table. This patch uses both the per-station GF support flag as well as the current BSS HT operation mode (non-GF stations present flag). Added the "ht_greenfield_support" field to struct iwl_cfg to replace the device-specific check in rs_use_green(). That check has been moved to iwlcore_init_ht_hw_capab(). Signed-off-by: Daniel C Halperin <daniel.c.halperin@intel.com> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
committed by
John W. Linville
parent
28e6f48953
commit
b261793da5
@ -394,7 +394,8 @@ static void iwlcore_init_ht_hw_capab(const struct iwl_priv *priv,
|
||||
|
||||
ht_info->ht_supported = true;
|
||||
|
||||
ht_info->cap |= IEEE80211_HT_CAP_GRN_FLD;
|
||||
if (priv->cfg->ht_greenfield_support)
|
||||
ht_info->cap |= IEEE80211_HT_CAP_GRN_FLD;
|
||||
ht_info->cap |= IEEE80211_HT_CAP_SGI_20;
|
||||
ht_info->cap |= (IEEE80211_HT_CAP_SM_PS &
|
||||
(WLAN_HT_CAP_SM_PS_DISABLED << 2));
|
||||
@ -2391,8 +2392,6 @@ static void iwl_ht_conf(struct iwl_priv *priv,
|
||||
}
|
||||
ht_conf = &sta->ht_cap;
|
||||
|
||||
iwl_conf->is_green_field = !!(ht_conf->cap & IEEE80211_HT_CAP_GRN_FLD);
|
||||
|
||||
iwl_conf->sm_ps = (u8)((ht_conf->cap & IEEE80211_HT_CAP_SM_PS) >> 2);
|
||||
|
||||
memcpy(&iwl_conf->mcs, &ht_conf->mcs, 16);
|
||||
|
Reference in New Issue
Block a user