aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-agn.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2010-01-21 14:23:30 -0500
committerReinette Chatre <reinette.chatre@intel.com>2010-03-09 19:04:40 -0500
commit470ab2dd6a7b0719e59830e11d7bc2e710867b94 (patch)
treec8c57d0b8f74d4a2006bf11438f9442ff12e61a4 /drivers/net/wireless/iwlwifi/iwl-agn.c
parent254aebf3d0439e7b0a8318f1604b3fdb4144f689 (diff)
iwlwifi: remove never-changing priv->rates_mask variable
It's always just IWL_RATES_MASK. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index d0fab876df05..e7e4bf71568c 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -2103,8 +2103,8 @@ static void iwl_alive_start(struct iwl_priv *priv)
2103 2103
2104 ieee80211_wake_queues(priv->hw); 2104 ieee80211_wake_queues(priv->hw);
2105 2105
2106 priv->active_rate = priv->rates_mask; 2106 priv->active_rate = IWL_RATES_MASK;
2107 priv->active_rate_basic = priv->rates_mask & IWL_BASIC_RATES_MASK; 2107 priv->active_rate_basic = IWL_RATES_MASK & IWL_BASIC_RATES_MASK;
2108 2108
2109 /* Configure Tx antenna selection based on H/W config */ 2109 /* Configure Tx antenna selection based on H/W config */
2110 if (priv->cfg->ops->hcmd->set_tx_ant) 2110 if (priv->cfg->ops->hcmd->set_tx_ant)
@@ -3392,7 +3392,6 @@ static int iwl_init_drv(struct iwl_priv *priv)
3392 priv->qos_data.qos_active = 0; 3392 priv->qos_data.qos_active = 0;
3393 priv->qos_data.qos_cap.val = 0; 3393 priv->qos_data.qos_cap.val = 0;
3394 3394
3395 priv->rates_mask = IWL_RATES_MASK;
3396 /* Set the tx_power_user_lmt to the lowest power level 3395 /* Set the tx_power_user_lmt to the lowest power level
3397 * this value will get overwritten by channel max power avg 3396 * this value will get overwritten by channel max power avg
3398 * from eeprom */ 3397 * from eeprom */