diff options
author | Johannes Berg <johannes.berg@intel.com> | 2012-03-06 16:30:56 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-03-07 13:56:32 -0500 |
commit | 6794f3ee1dc4a2f7ebed99a4c075f00bbebbcfdc (patch) | |
tree | 90814b7afc0b9b116b1d390c4aa3326d123aacd9 /drivers/net/wireless/iwlwifi/iwl-6000.c | |
parent | b9ad70da6a7ed166539b188a95e0aef119555e14 (diff) |
iwlwifi: constify remaining config data
The HW configuration settings base_params, ht_params
and bt_params all should be const, make it so.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-6000.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-6000.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c index a64f0f28124..d2e24824fc0 100644 --- a/drivers/net/wireless/iwlwifi/iwl-6000.c +++ b/drivers/net/wireless/iwlwifi/iwl-6000.c | |||
@@ -271,7 +271,7 @@ static struct iwl_lib_ops iwl6030_lib = { | |||
271 | .temperature = iwlagn_temperature, | 271 | .temperature = iwlagn_temperature, |
272 | }; | 272 | }; |
273 | 273 | ||
274 | static struct iwl_base_params iwl6000_base_params = { | 274 | static const struct iwl_base_params iwl6000_base_params = { |
275 | .eeprom_size = OTP_LOW_IMAGE_SIZE, | 275 | .eeprom_size = OTP_LOW_IMAGE_SIZE, |
276 | .num_of_queues = IWLAGN_NUM_QUEUES, | 276 | .num_of_queues = IWLAGN_NUM_QUEUES, |
277 | .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES, | 277 | .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES, |
@@ -288,7 +288,7 @@ static struct iwl_base_params iwl6000_base_params = { | |||
288 | .shadow_reg_enable = true, | 288 | .shadow_reg_enable = true, |
289 | }; | 289 | }; |
290 | 290 | ||
291 | static struct iwl_base_params iwl6050_base_params = { | 291 | static const struct iwl_base_params iwl6050_base_params = { |
292 | .eeprom_size = OTP_LOW_IMAGE_SIZE, | 292 | .eeprom_size = OTP_LOW_IMAGE_SIZE, |
293 | .num_of_queues = IWLAGN_NUM_QUEUES, | 293 | .num_of_queues = IWLAGN_NUM_QUEUES, |
294 | .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES, | 294 | .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES, |
@@ -304,7 +304,8 @@ static struct iwl_base_params iwl6050_base_params = { | |||
304 | .max_event_log_size = 1024, | 304 | .max_event_log_size = 1024, |
305 | .shadow_reg_enable = true, | 305 | .shadow_reg_enable = true, |
306 | }; | 306 | }; |
307 | static struct iwl_base_params iwl6000_g2_base_params = { | 307 | |
308 | static const struct iwl_base_params iwl6000_g2_base_params = { | ||
308 | .eeprom_size = OTP_LOW_IMAGE_SIZE, | 309 | .eeprom_size = OTP_LOW_IMAGE_SIZE, |
309 | .num_of_queues = IWLAGN_NUM_QUEUES, | 310 | .num_of_queues = IWLAGN_NUM_QUEUES, |
310 | .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES, | 311 | .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES, |
@@ -321,12 +322,12 @@ static struct iwl_base_params iwl6000_g2_base_params = { | |||
321 | .shadow_reg_enable = true, | 322 | .shadow_reg_enable = true, |
322 | }; | 323 | }; |
323 | 324 | ||
324 | static struct iwl_ht_params iwl6000_ht_params = { | 325 | static const struct iwl_ht_params iwl6000_ht_params = { |
325 | .ht_greenfield_support = true, | 326 | .ht_greenfield_support = true, |
326 | .use_rts_for_aggregation = true, /* use rts/cts protection */ | 327 | .use_rts_for_aggregation = true, /* use rts/cts protection */ |
327 | }; | 328 | }; |
328 | 329 | ||
329 | static struct iwl_bt_params iwl6000_bt_params = { | 330 | static const struct iwl_bt_params iwl6000_bt_params = { |
330 | /* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */ | 331 | /* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */ |
331 | .advanced_bt_coexist = true, | 332 | .advanced_bt_coexist = true, |
332 | .agg_time_limit = BT_AGG_THRESHOLD_DEF, | 333 | .agg_time_limit = BT_AGG_THRESHOLD_DEF, |