aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn.c5
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-dev.h2
-rw-r--r--drivers/net/wireless/iwlwifi/iwl3945-base.c5
3 files changed, 4 insertions, 8 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 */
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h
index c277e4e8cf87..4d6558fbebe5 100644
--- a/drivers/net/wireless/iwlwifi/iwl-dev.h
+++ b/drivers/net/wireless/iwlwifi/iwl-dev.h
@@ -1217,8 +1217,6 @@ struct iwl_priv {
1217#endif 1217#endif
1218 1218
1219 /* context information */ 1219 /* context information */
1220 u16 rates_mask;
1221
1222 u8 bssid[ETH_ALEN]; 1220 u8 bssid[ETH_ALEN];
1223 u16 rts_threshold; 1221 u16 rts_threshold;
1224 u8 mac_addr[ETH_ALEN]; 1222 u8 mac_addr[ETH_ALEN];
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index 2b2c96bf5a53..b2b050592bc1 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -2508,8 +2508,8 @@ static void iwl3945_alive_start(struct iwl_priv *priv)
2508 2508
2509 ieee80211_wake_queues(priv->hw); 2509 ieee80211_wake_queues(priv->hw);
2510 2510
2511 priv->active_rate = priv->rates_mask; 2511 priv->active_rate = IWL_RATES_MASK;
2512 priv->active_rate_basic = priv->rates_mask & IWL_BASIC_RATES_MASK; 2512 priv->active_rate_basic = IWL_RATES_MASK & IWL_BASIC_RATES_MASK;
2513 2513
2514 iwl_power_update_mode(priv, true); 2514 iwl_power_update_mode(priv, true);
2515 2515
@@ -3855,7 +3855,6 @@ static int iwl3945_init_drv(struct iwl_priv *priv)
3855 priv->qos_data.qos_active = 0; 3855 priv->qos_data.qos_active = 0;
3856 priv->qos_data.qos_cap.val = 0; 3856 priv->qos_data.qos_cap.val = 0;
3857 3857
3858 priv->rates_mask = IWL_RATES_MASK;
3859 priv->tx_power_user_lmt = IWL_DEFAULT_TX_POWER; 3858 priv->tx_power_user_lmt = IWL_DEFAULT_TX_POWER;
3860 3859
3861 if (eeprom->version < EEPROM_3945_EEPROM_VERSION) { 3860 if (eeprom->version < EEPROM_3945_EEPROM_VERSION) {