diff options
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-power.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-shared.h | 1 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-trans-pcie.c | 2 |
6 files changed, 5 insertions, 8 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index 863c27e20dbc..f8163717d7d1 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c | |||
@@ -1127,8 +1127,6 @@ static void iwl_set_hw_params(struct iwl_priv *priv) | |||
1127 | 1127 | ||
1128 | hw_params(priv).num_ampdu_queues = | 1128 | hw_params(priv).num_ampdu_queues = |
1129 | cfg(priv)->base_params->num_of_ampdu_queues; | 1129 | cfg(priv)->base_params->num_of_ampdu_queues; |
1130 | hw_params(priv).shadow_reg_enable = | ||
1131 | cfg(priv)->base_params->shadow_reg_enable; | ||
1132 | hw_params(priv).wd_timeout = cfg(priv)->base_params->wd_timeout; | 1130 | hw_params(priv).wd_timeout = cfg(priv)->base_params->wd_timeout; |
1133 | 1131 | ||
1134 | /* Device-specific setup */ | 1132 | /* Device-specific setup */ |
diff --git a/drivers/net/wireless/iwlwifi/iwl-power.c b/drivers/net/wireless/iwlwifi/iwl-power.c index d76ff239d5f1..f79ff16e29f4 100644 --- a/drivers/net/wireless/iwlwifi/iwl-power.c +++ b/drivers/net/wireless/iwlwifi/iwl-power.c | |||
@@ -215,7 +215,7 @@ static void iwl_static_sleep_cmd(struct iwl_priv *priv, | |||
215 | else | 215 | else |
216 | cmd->flags &= ~IWL_POWER_SLEEP_OVER_DTIM_MSK; | 216 | cmd->flags &= ~IWL_POWER_SLEEP_OVER_DTIM_MSK; |
217 | 217 | ||
218 | if (hw_params(priv).shadow_reg_enable) | 218 | if (cfg(priv)->base_params->shadow_reg_enable) |
219 | cmd->flags |= IWL_POWER_SHADOW_REG_ENA; | 219 | cmd->flags |= IWL_POWER_SHADOW_REG_ENA; |
220 | else | 220 | else |
221 | cmd->flags &= ~IWL_POWER_SHADOW_REG_ENA; | 221 | cmd->flags &= ~IWL_POWER_SHADOW_REG_ENA; |
@@ -301,7 +301,7 @@ static void iwl_power_fill_sleep_cmd(struct iwl_priv *priv, | |||
301 | if (priv->power_data.bus_pm) | 301 | if (priv->power_data.bus_pm) |
302 | cmd->flags |= IWL_POWER_PCI_PM_MSK; | 302 | cmd->flags |= IWL_POWER_PCI_PM_MSK; |
303 | 303 | ||
304 | if (hw_params(priv).shadow_reg_enable) | 304 | if (cfg(priv)->base_params->shadow_reg_enable) |
305 | cmd->flags |= IWL_POWER_SHADOW_REG_ENA; | 305 | cmd->flags |= IWL_POWER_SHADOW_REG_ENA; |
306 | else | 306 | else |
307 | cmd->flags &= ~IWL_POWER_SHADOW_REG_ENA; | 307 | cmd->flags &= ~IWL_POWER_SHADOW_REG_ENA; |
diff --git a/drivers/net/wireless/iwlwifi/iwl-shared.h b/drivers/net/wireless/iwlwifi/iwl-shared.h index 30b942f77814..a5ab58ce0307 100644 --- a/drivers/net/wireless/iwlwifi/iwl-shared.h +++ b/drivers/net/wireless/iwlwifi/iwl-shared.h | |||
@@ -185,7 +185,6 @@ struct iwl_hw_params { | |||
185 | u8 valid_tx_ant; | 185 | u8 valid_tx_ant; |
186 | u8 valid_rx_ant; | 186 | u8 valid_rx_ant; |
187 | u8 ht40_channel; | 187 | u8 ht40_channel; |
188 | bool shadow_reg_enable; | ||
189 | u16 sku; | 188 | u16 sku; |
190 | u32 rx_page_order; | 189 | u32 rx_page_order; |
191 | u32 ct_kill_threshold; | 190 | u32 ct_kill_threshold; |
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c index e8d3129d5bde..911a9f113f1f 100644 --- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c +++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c | |||
@@ -141,7 +141,7 @@ void iwl_rx_queue_update_write_ptr(struct iwl_trans *trans, | |||
141 | if (q->need_update == 0) | 141 | if (q->need_update == 0) |
142 | goto exit_unlock; | 142 | goto exit_unlock; |
143 | 143 | ||
144 | if (hw_params(trans).shadow_reg_enable) { | 144 | if (cfg(trans)->base_params->shadow_reg_enable) { |
145 | /* shadow register enabled */ | 145 | /* shadow register enabled */ |
146 | /* Device expects a multiple of 8 */ | 146 | /* Device expects a multiple of 8 */ |
147 | q->write_actual = (q->write & ~0x7); | 147 | q->write_actual = (q->write & ~0x7); |
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c index ca4ceeacc989..2573f7149f16 100644 --- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c +++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c | |||
@@ -136,7 +136,7 @@ void iwl_txq_update_write_ptr(struct iwl_trans *trans, struct iwl_tx_queue *txq) | |||
136 | if (txq->need_update == 0) | 136 | if (txq->need_update == 0) |
137 | return; | 137 | return; |
138 | 138 | ||
139 | if (hw_params(trans).shadow_reg_enable) { | 139 | if (cfg(trans)->base_params->shadow_reg_enable) { |
140 | /* shadow register enabled */ | 140 | /* shadow register enabled */ |
141 | iwl_write32(trans, HBUS_TARG_WRPTR, | 141 | iwl_write32(trans, HBUS_TARG_WRPTR, |
142 | txq->q.write_ptr | (txq_id << 8)); | 142 | txq->q.write_ptr | (txq_id << 8)); |
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c index 4a2d4b58cdc8..44050fa414d1 100644 --- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c +++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c | |||
@@ -828,7 +828,7 @@ static int iwl_nic_init(struct iwl_trans *trans) | |||
828 | if (iwl_tx_init(trans)) | 828 | if (iwl_tx_init(trans)) |
829 | return -ENOMEM; | 829 | return -ENOMEM; |
830 | 830 | ||
831 | if (hw_params(trans).shadow_reg_enable) { | 831 | if (cfg(trans)->base_params->shadow_reg_enable) { |
832 | /* enable shadow regs in HW */ | 832 | /* enable shadow regs in HW */ |
833 | iwl_set_bit(trans, CSR_MAC_SHADOW_REG_CTRL, | 833 | iwl_set_bit(trans, CSR_MAC_SHADOW_REG_CTRL, |
834 | 0x800FFFFF); | 834 | 0x800FFFFF); |