Skip to content

Commit

Permalink
iwlwifi: remove never-changing priv->rates_mask variable
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Johannes Berg authored and Reinette Chatre committed Mar 10, 2010
1 parent 254aebf commit 470ab2d
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 8 deletions.
5 changes: 2 additions & 3 deletions drivers/net/wireless/iwlwifi/iwl-agn.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2103,8 +2103,8 @@ static void iwl_alive_start(struct iwl_priv *priv)

ieee80211_wake_queues(priv->hw);

priv->active_rate = priv->rates_mask;
priv->active_rate_basic = priv->rates_mask & IWL_BASIC_RATES_MASK;
priv->active_rate = IWL_RATES_MASK;
priv->active_rate_basic = IWL_RATES_MASK & IWL_BASIC_RATES_MASK;

/* Configure Tx antenna selection based on H/W config */
if (priv->cfg->ops->hcmd->set_tx_ant)
Expand Down Expand Up @@ -3392,7 +3392,6 @@ static int iwl_init_drv(struct iwl_priv *priv)
priv->qos_data.qos_active = 0;
priv->qos_data.qos_cap.val = 0;

priv->rates_mask = IWL_RATES_MASK;
/* Set the tx_power_user_lmt to the lowest power level
* this value will get overwritten by channel max power avg
* from eeprom */
Expand Down
2 changes: 0 additions & 2 deletions drivers/net/wireless/iwlwifi/iwl-dev.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1217,8 +1217,6 @@ struct iwl_priv {
#endif

/* context information */
u16 rates_mask;

u8 bssid[ETH_ALEN];
u16 rts_threshold;
u8 mac_addr[ETH_ALEN];
Expand Down
5 changes: 2 additions & 3 deletions drivers/net/wireless/iwlwifi/iwl3945-base.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2508,8 +2508,8 @@ static void iwl3945_alive_start(struct iwl_priv *priv)

ieee80211_wake_queues(priv->hw);

priv->active_rate = priv->rates_mask;
priv->active_rate_basic = priv->rates_mask & IWL_BASIC_RATES_MASK;
priv->active_rate = IWL_RATES_MASK;
priv->active_rate_basic = IWL_RATES_MASK & IWL_BASIC_RATES_MASK;

iwl_power_update_mode(priv, true);

Expand Down Expand Up @@ -3855,7 +3855,6 @@ static int iwl3945_init_drv(struct iwl_priv *priv)
priv->qos_data.qos_active = 0;
priv->qos_data.qos_cap.val = 0;

priv->rates_mask = IWL_RATES_MASK;
priv->tx_power_user_lmt = IWL_DEFAULT_TX_POWER;

if (eeprom->version < EEPROM_3945_EEPROM_VERSION) {
Expand Down

0 comments on commit 470ab2d

Please sign in to comment.