Re: [PATCH v2 11/18] iwlwifi: make use of conf_is_ht*() helpers

[Johannes Berg <johannes@sipsolutions.net>]

[-- Attachment #1: Type: text/plain, Size: 3332 bytes --]

On Mon, 2008-12-22 at 10:20 -0800, Luis Rodriguez wrote:
> Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>

Acked-by: Johannes Berg <johannes@sipsolutions.net>

> ---
>  drivers/net/wireless/iwlwifi/iwl-agn-rs.c |    6 +++---
>  drivers/net/wireless/iwlwifi/iwl-agn.c    |    6 +++---
>  2 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
> index f032167..59d4e11 100644
> --- a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
> +++ b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
> @@ -1131,7 +1131,7 @@ static int rs_switch_to_mimo2(struct iwl_priv *priv,
>         s32 rate;
>         s8 is_green = lq_sta->is_green;
> 
> -       if (!conf->ht.enabled || !sta->ht_cap.ht_supported)
> +       if (!conf_is_ht(conf) || !sta->ht_cap.ht_supported)
>                 return -1;
> 
>         if (((sta->ht_cap.cap & IEEE80211_HT_CAP_SM_PS) >> 2)
> @@ -1198,7 +1198,7 @@ static int rs_switch_to_siso(struct iwl_priv *priv,
>         u8 is_green = lq_sta->is_green;
>         s32 rate;
> 
> -       if (!conf->ht.enabled || !sta->ht_cap.ht_supported)
> +       if (!conf_is_ht(conf) || !sta->ht_cap.ht_supported)
>                 return -1;
> 
>         IWL_DEBUG_RATE("LQ: try to switch to SISO\n");
> @@ -1998,7 +1998,7 @@ lq_update:
>                  * stay with best antenna legacy modulation for a while
>                  * before next round of mode comparisons. */
>                 tbl1 = &(lq_sta->lq_info[lq_sta->active_tbl]);
> -               if (is_legacy(tbl1->lq_type) && !conf->ht.enabled &&
> +               if (is_legacy(tbl1->lq_type) && !conf_is_ht(conf) &&
>                     lq_sta->action_counter >= 1) {
>                         lq_sta->action_counter = 0;
>                         IWL_DEBUG_RATE("LQ: STAY in legacy table\n");
> diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
> index 05cd04c..99a17d8 100644
> --- a/drivers/net/wireless/iwlwifi/iwl-agn.c
> +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
> @@ -523,9 +523,9 @@ static void iwl_ht_conf(struct iwl_priv *priv,
>          */
> 
>         iwl_conf->extension_chan_offset = IEEE80211_HT_PARAM_CHA_SEC_NONE;
> -       if (priv->hw->conf.ht.channel_type == NL80211_CHAN_HT40MINUS)
> +       if (conf_is_ht40_minus(&priv->hw->conf))
>                 iwl_conf->extension_chan_offset = IEEE80211_HT_PARAM_CHA_SEC_BELOW;
> -       else if(priv->hw->conf.ht.channel_type == NL80211_CHAN_HT40PLUS)
> +       else if (conf_is_ht40_plus(&priv->hw->conf))
>                 iwl_conf->extension_chan_offset = IEEE80211_HT_PARAM_CHA_SEC_ABOVE;
> 
>         /* If no above or below channel supplied disable FAT channel */
> @@ -2553,7 +2553,7 @@ static int iwl_mac_config(struct ieee80211_hw *hw, u32 changed)
>         mutex_lock(&priv->mutex);
>         IWL_DEBUG_MAC80211("enter to channel %d\n", conf->channel->hw_value);
> 
> -       priv->current_ht_config.is_ht = conf->ht.enabled;
> +       priv->current_ht_config.is_ht = conf_is_ht(conf);
> 
>         if (conf->radio_enabled && iwl_radio_kill_sw_enable_radio(priv)) {
>                 IWL_DEBUG_MAC80211("leave - RF-KILL - waiting for uCode\n");
> --
> 1.6.1.rc3.51.g5832d
> 
> 

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]