diff options
author | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2009-09-25 17:24:26 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-10-07 16:39:36 -0400 |
commit | d8c07e7a84950b5fdef424c6dabe6bed3a9ffa19 (patch) | |
tree | 8286d65e226654bf403c0ac551f3ef16fd07087b /drivers/net/wireless/iwlwifi/iwl-6000.c | |
parent | 2b396a120922062a0ffd2648be3ed7e72ff83620 (diff) |
iwlwifi: Chain Noise Calibration for 6000 series
Adding support of Chain Noise Calibration for 6000 series NICs.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@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 | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c index 01a1f81cba2a..ad5d77c96494 100644 --- a/drivers/net/wireless/iwlwifi/iwl-6000.c +++ b/drivers/net/wireless/iwlwifi/iwl-6000.c | |||
@@ -222,18 +222,11 @@ static struct iwl_lib_ops iwl6000_lib = { | |||
222 | }, | 222 | }, |
223 | }; | 223 | }; |
224 | 224 | ||
225 | static struct iwl_hcmd_utils_ops iwl6000_hcmd_utils = { | ||
226 | .get_hcmd_size = iwl5000_get_hcmd_size, | ||
227 | .build_addsta_hcmd = iwl5000_build_addsta_hcmd, | ||
228 | .rts_tx_cmd_flag = iwl5000_rts_tx_cmd_flag, | ||
229 | .calc_rssi = iwl5000_calc_rssi, | ||
230 | }; | ||
231 | |||
232 | static struct iwl_ops iwl6000_ops = { | 225 | static struct iwl_ops iwl6000_ops = { |
233 | .ucode = &iwl5000_ucode, | 226 | .ucode = &iwl5000_ucode, |
234 | .lib = &iwl6000_lib, | 227 | .lib = &iwl6000_lib, |
235 | .hcmd = &iwl5000_hcmd, | 228 | .hcmd = &iwl5000_hcmd, |
236 | .utils = &iwl6000_hcmd_utils, | 229 | .utils = &iwl5000_hcmd_utils, |
237 | }; | 230 | }; |
238 | 231 | ||
239 | 232 | ||
@@ -260,6 +253,7 @@ struct iwl_cfg iwl6000h_2agn_cfg = { | |||
260 | .ht_greenfield_support = true, | 253 | .ht_greenfield_support = true, |
261 | .led_compensation = 51, | 254 | .led_compensation = 51, |
262 | .use_rts_for_ht = true, /* use rts/cts protection */ | 255 | .use_rts_for_ht = true, /* use rts/cts protection */ |
256 | .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS, | ||
263 | }; | 257 | }; |
264 | 258 | ||
265 | struct iwl_cfg iwl6000h_2abg_cfg = { | 259 | struct iwl_cfg iwl6000h_2abg_cfg = { |
@@ -281,6 +275,7 @@ struct iwl_cfg iwl6000h_2abg_cfg = { | |||
281 | .shadow_ram_support = true, | 275 | .shadow_ram_support = true, |
282 | .ht_greenfield_support = true, | 276 | .ht_greenfield_support = true, |
283 | .led_compensation = 51, | 277 | .led_compensation = 51, |
278 | .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS, | ||
284 | }; | 279 | }; |
285 | 280 | ||
286 | struct iwl_cfg iwl6000h_2bg_cfg = { | 281 | struct iwl_cfg iwl6000h_2bg_cfg = { |
@@ -302,6 +297,7 @@ struct iwl_cfg iwl6000h_2bg_cfg = { | |||
302 | .shadow_ram_support = true, | 297 | .shadow_ram_support = true, |
303 | .ht_greenfield_support = true, | 298 | .ht_greenfield_support = true, |
304 | .led_compensation = 51, | 299 | .led_compensation = 51, |
300 | .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS, | ||
305 | }; | 301 | }; |
306 | 302 | ||
307 | /* | 303 | /* |
@@ -327,6 +323,7 @@ struct iwl_cfg iwl6000i_2agn_cfg = { | |||
327 | .ht_greenfield_support = true, | 323 | .ht_greenfield_support = true, |
328 | .led_compensation = 51, | 324 | .led_compensation = 51, |
329 | .use_rts_for_ht = true, /* use rts/cts protection */ | 325 | .use_rts_for_ht = true, /* use rts/cts protection */ |
326 | .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS, | ||
330 | }; | 327 | }; |
331 | 328 | ||
332 | struct iwl_cfg iwl6000i_2abg_cfg = { | 329 | struct iwl_cfg iwl6000i_2abg_cfg = { |
@@ -348,6 +345,7 @@ struct iwl_cfg iwl6000i_2abg_cfg = { | |||
348 | .shadow_ram_support = true, | 345 | .shadow_ram_support = true, |
349 | .ht_greenfield_support = true, | 346 | .ht_greenfield_support = true, |
350 | .led_compensation = 51, | 347 | .led_compensation = 51, |
348 | .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS, | ||
351 | }; | 349 | }; |
352 | 350 | ||
353 | struct iwl_cfg iwl6000i_2bg_cfg = { | 351 | struct iwl_cfg iwl6000i_2bg_cfg = { |
@@ -369,6 +367,7 @@ struct iwl_cfg iwl6000i_2bg_cfg = { | |||
369 | .shadow_ram_support = true, | 367 | .shadow_ram_support = true, |
370 | .ht_greenfield_support = true, | 368 | .ht_greenfield_support = true, |
371 | .led_compensation = 51, | 369 | .led_compensation = 51, |
370 | .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS, | ||
372 | }; | 371 | }; |
373 | 372 | ||
374 | struct iwl_cfg iwl6050_2agn_cfg = { | 373 | struct iwl_cfg iwl6050_2agn_cfg = { |
@@ -391,6 +390,7 @@ struct iwl_cfg iwl6050_2agn_cfg = { | |||
391 | .ht_greenfield_support = true, | 390 | .ht_greenfield_support = true, |
392 | .led_compensation = 51, | 391 | .led_compensation = 51, |
393 | .use_rts_for_ht = true, /* use rts/cts protection */ | 392 | .use_rts_for_ht = true, /* use rts/cts protection */ |
393 | .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS, | ||
394 | }; | 394 | }; |
395 | 395 | ||
396 | struct iwl_cfg iwl6050_2abg_cfg = { | 396 | struct iwl_cfg iwl6050_2abg_cfg = { |
@@ -412,6 +412,7 @@ struct iwl_cfg iwl6050_2abg_cfg = { | |||
412 | .shadow_ram_support = true, | 412 | .shadow_ram_support = true, |
413 | .ht_greenfield_support = true, | 413 | .ht_greenfield_support = true, |
414 | .led_compensation = 51, | 414 | .led_compensation = 51, |
415 | .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS, | ||
415 | }; | 416 | }; |
416 | 417 | ||
417 | struct iwl_cfg iwl6000_3agn_cfg = { | 418 | struct iwl_cfg iwl6000_3agn_cfg = { |
@@ -434,6 +435,7 @@ struct iwl_cfg iwl6000_3agn_cfg = { | |||
434 | .ht_greenfield_support = true, | 435 | .ht_greenfield_support = true, |
435 | .led_compensation = 51, | 436 | .led_compensation = 51, |
436 | .use_rts_for_ht = true, /* use rts/cts protection */ | 437 | .use_rts_for_ht = true, /* use rts/cts protection */ |
438 | .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS, | ||
437 | }; | 439 | }; |
438 | 440 | ||
439 | struct iwl_cfg iwl6050_3agn_cfg = { | 441 | struct iwl_cfg iwl6050_3agn_cfg = { |
@@ -456,6 +458,7 @@ struct iwl_cfg iwl6050_3agn_cfg = { | |||
456 | .ht_greenfield_support = true, | 458 | .ht_greenfield_support = true, |
457 | .led_compensation = 51, | 459 | .led_compensation = 51, |
458 | .use_rts_for_ht = true, /* use rts/cts protection */ | 460 | .use_rts_for_ht = true, /* use rts/cts protection */ |
461 | .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS, | ||
459 | }; | 462 | }; |
460 | 463 | ||
461 | MODULE_FIRMWARE(IWL6000_MODULE_FIRMWARE(IWL6000_UCODE_API_MAX)); | 464 | MODULE_FIRMWARE(IWL6000_MODULE_FIRMWARE(IWL6000_UCODE_API_MAX)); |