iwlwifi: clean up ht config a little
is_ht can be bool instead of u8, and there's no need to use IWL_CHANNEL_WIDTH_* constants in supported_chan_width when that could just be named is_40mhz instead. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
f3a2a42470
commit
c812ee2485
|
@ -636,8 +636,7 @@ u8 iwl_is_ht40_tx_allowed(struct iwl_priv *priv,
|
||||||
{
|
{
|
||||||
struct iwl_ht_info *iwl_ht_conf = &priv->current_ht_config;
|
struct iwl_ht_info *iwl_ht_conf = &priv->current_ht_config;
|
||||||
|
|
||||||
if ((!iwl_ht_conf->is_ht) ||
|
if (!iwl_ht_conf->is_ht || !iwl_ht_conf->is_40mhz)
|
||||||
(iwl_ht_conf->supported_chan_width != IWL_CHANNEL_WIDTH_40MHZ))
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
/* We do not check for IEEE80211_HT_CAP_SUP_WIDTH_20_40
|
/* We do not check for IEEE80211_HT_CAP_SUP_WIDTH_20_40
|
||||||
|
@ -2619,21 +2618,18 @@ int iwl_mac_config(struct ieee80211_hw *hw, u32 changed)
|
||||||
if (conf_is_ht40_minus(conf)) {
|
if (conf_is_ht40_minus(conf)) {
|
||||||
ht_conf->extension_chan_offset =
|
ht_conf->extension_chan_offset =
|
||||||
IEEE80211_HT_PARAM_CHA_SEC_BELOW;
|
IEEE80211_HT_PARAM_CHA_SEC_BELOW;
|
||||||
ht_conf->supported_chan_width =
|
ht_conf->is_40mhz = true;
|
||||||
IWL_CHANNEL_WIDTH_40MHZ;
|
|
||||||
} else if (conf_is_ht40_plus(conf)) {
|
} else if (conf_is_ht40_plus(conf)) {
|
||||||
ht_conf->extension_chan_offset =
|
ht_conf->extension_chan_offset =
|
||||||
IEEE80211_HT_PARAM_CHA_SEC_ABOVE;
|
IEEE80211_HT_PARAM_CHA_SEC_ABOVE;
|
||||||
ht_conf->supported_chan_width =
|
ht_conf->is_40mhz = true;
|
||||||
IWL_CHANNEL_WIDTH_40MHZ;
|
|
||||||
} else {
|
} else {
|
||||||
ht_conf->extension_chan_offset =
|
ht_conf->extension_chan_offset =
|
||||||
IEEE80211_HT_PARAM_CHA_SEC_NONE;
|
IEEE80211_HT_PARAM_CHA_SEC_NONE;
|
||||||
ht_conf->supported_chan_width =
|
ht_conf->is_40mhz = false;
|
||||||
IWL_CHANNEL_WIDTH_20MHZ;
|
|
||||||
}
|
}
|
||||||
} else
|
} else
|
||||||
ht_conf->supported_chan_width = IWL_CHANNEL_WIDTH_20MHZ;
|
ht_conf->is_40mhz = false;
|
||||||
/* Default to no protection. Protection mode will later be set
|
/* Default to no protection. Protection mode will later be set
|
||||||
* from BSS config in iwl_ht_conf */
|
* from BSS config in iwl_ht_conf */
|
||||||
ht_conf->ht_protection = IEEE80211_HT_OP_MODE_PROTECTION_NONE;
|
ht_conf->ht_protection = IEEE80211_HT_OP_MODE_PROTECTION_NONE;
|
||||||
|
|
|
@ -504,8 +504,8 @@ union iwl_ht_rate_supp {
|
||||||
|
|
||||||
struct iwl_ht_info {
|
struct iwl_ht_info {
|
||||||
/* self configuration data */
|
/* self configuration data */
|
||||||
u8 is_ht;
|
bool is_ht;
|
||||||
u8 supported_chan_width;
|
bool is_40mhz;
|
||||||
u8 sm_ps;
|
u8 sm_ps;
|
||||||
struct ieee80211_mcs_info mcs;
|
struct ieee80211_mcs_info mcs;
|
||||||
/* BSS related data */
|
/* BSS related data */
|
||||||
|
@ -726,9 +726,6 @@ struct iwl_dma_ptr {
|
||||||
size_t size;
|
size_t size;
|
||||||
};
|
};
|
||||||
|
|
||||||
#define IWL_CHANNEL_WIDTH_20MHZ 0
|
|
||||||
#define IWL_CHANNEL_WIDTH_40MHZ 1
|
|
||||||
|
|
||||||
#define IWL_OPERATION_MODE_AUTO 0
|
#define IWL_OPERATION_MODE_AUTO 0
|
||||||
#define IWL_OPERATION_MODE_HT_ONLY 1
|
#define IWL_OPERATION_MODE_HT_ONLY 1
|
||||||
#define IWL_OPERATION_MODE_MIXED 2
|
#define IWL_OPERATION_MODE_MIXED 2
|
||||||
|
|
Loading…
Reference in a new issue