Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 470ab2dd authored by Johannes Berg's avatar Johannes Berg Committed by Reinette Chatre
Browse files

iwlwifi: remove never-changing priv->rates_mask variable 



It's always just IWL_RATES_MASK.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
parent 254aebf3

drivers/net/wireless/iwlwifi/iwl-agn.c

+2 −3
Original line number Diff line number Diff line
@@ -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)
@@ -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 */

drivers/net/wireless/iwlwifi/iwl-dev.h

+0 −2
Original line number Diff line number Diff line
@@ -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];

drivers/net/wireless/iwlwifi/iwl3945-base.c

+2 −3
Original line number Diff line number Diff line
@@ -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);
@@ -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) {