diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-5000.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-5000.c | 31 |
1 files changed, 12 insertions, 19 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c index 4d3dda1beb2..6c09b2477b9 100644 --- a/drivers/net/wireless/iwlwifi/iwl-5000.c +++ b/drivers/net/wireless/iwlwifi/iwl-5000.c | |||
@@ -397,13 +397,6 @@ static const struct iwl_ops iwl5150_ops = { | |||
397 | .led = &iwlagn_led_ops, | 397 | .led = &iwlagn_led_ops, |
398 | }; | 398 | }; |
399 | 399 | ||
400 | struct iwl_mod_params iwl50_mod_params = { | ||
401 | .amsdu_size_8K = 1, | ||
402 | .restart_fw = 1, | ||
403 | /* the rest are 0 by default */ | ||
404 | }; | ||
405 | |||
406 | |||
407 | struct iwl_cfg iwl5300_agn_cfg = { | 400 | struct iwl_cfg iwl5300_agn_cfg = { |
408 | .name = "Intel(R) Ultimate N WiFi Link 5300 AGN", | 401 | .name = "Intel(R) Ultimate N WiFi Link 5300 AGN", |
409 | .fw_name_pre = IWL5000_FW_PRE, | 402 | .fw_name_pre = IWL5000_FW_PRE, |
@@ -416,7 +409,7 @@ struct iwl_cfg iwl5300_agn_cfg = { | |||
416 | .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION, | 409 | .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION, |
417 | .num_of_queues = IWLAGN_NUM_QUEUES, | 410 | .num_of_queues = IWLAGN_NUM_QUEUES, |
418 | .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES, | 411 | .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES, |
419 | .mod_params = &iwl50_mod_params, | 412 | .mod_params = &iwlagn_mod_params, |
420 | .valid_tx_ant = ANT_ABC, | 413 | .valid_tx_ant = ANT_ABC, |
421 | .valid_rx_ant = ANT_ABC, | 414 | .valid_rx_ant = ANT_ABC, |
422 | .pll_cfg_val = CSR50_ANA_PLL_CFG_VAL, | 415 | .pll_cfg_val = CSR50_ANA_PLL_CFG_VAL, |
@@ -443,7 +436,7 @@ struct iwl_cfg iwl5100_bgn_cfg = { | |||
443 | .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION, | 436 | .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION, |
444 | .num_of_queues = IWLAGN_NUM_QUEUES, | 437 | .num_of_queues = IWLAGN_NUM_QUEUES, |
445 | .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES, | 438 | .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES, |
446 | .mod_params = &iwl50_mod_params, | 439 | .mod_params = &iwlagn_mod_params, |
447 | .valid_tx_ant = ANT_B, | 440 | .valid_tx_ant = ANT_B, |
448 | .valid_rx_ant = ANT_AB, | 441 | .valid_rx_ant = ANT_AB, |
449 | .pll_cfg_val = CSR50_ANA_PLL_CFG_VAL, | 442 | .pll_cfg_val = CSR50_ANA_PLL_CFG_VAL, |
@@ -470,7 +463,7 @@ struct iwl_cfg iwl5100_abg_cfg = { | |||
470 | .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION, | 463 | .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION, |
471 | .num_of_queues = IWLAGN_NUM_QUEUES, | 464 | .num_of_queues = IWLAGN_NUM_QUEUES, |
472 | .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES, | 465 | .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES, |
473 | .mod_params = &iwl50_mod_params, | 466 | .mod_params = &iwlagn_mod_params, |
474 | .valid_tx_ant = ANT_B, | 467 | .valid_tx_ant = ANT_B, |
475 | .valid_rx_ant = ANT_AB, | 468 | .valid_rx_ant = ANT_AB, |
476 | .pll_cfg_val = CSR50_ANA_PLL_CFG_VAL, | 469 | .pll_cfg_val = CSR50_ANA_PLL_CFG_VAL, |
@@ -495,7 +488,7 @@ struct iwl_cfg iwl5100_agn_cfg = { | |||
495 | .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION, | 488 | .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION, |
496 | .num_of_queues = IWLAGN_NUM_QUEUES, | 489 | .num_of_queues = IWLAGN_NUM_QUEUES, |
497 | .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES, | 490 | .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES, |
498 | .mod_params = &iwl50_mod_params, | 491 | .mod_params = &iwlagn_mod_params, |
499 | .valid_tx_ant = ANT_B, | 492 | .valid_tx_ant = ANT_B, |
500 | .valid_rx_ant = ANT_AB, | 493 | .valid_rx_ant = ANT_AB, |
501 | .pll_cfg_val = CSR50_ANA_PLL_CFG_VAL, | 494 | .pll_cfg_val = CSR50_ANA_PLL_CFG_VAL, |
@@ -522,7 +515,7 @@ struct iwl_cfg iwl5350_agn_cfg = { | |||
522 | .eeprom_calib_ver = EEPROM_5050_TX_POWER_VERSION, | 515 | .eeprom_calib_ver = EEPROM_5050_TX_POWER_VERSION, |
523 | .num_of_queues = IWLAGN_NUM_QUEUES, | 516 | .num_of_queues = IWLAGN_NUM_QUEUES, |
524 | .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES, | 517 | .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES, |
525 | .mod_params = &iwl50_mod_params, | 518 | .mod_params = &iwlagn_mod_params, |
526 | .valid_tx_ant = ANT_ABC, | 519 | .valid_tx_ant = ANT_ABC, |
527 | .valid_rx_ant = ANT_ABC, | 520 | .valid_rx_ant = ANT_ABC, |
528 | .pll_cfg_val = CSR50_ANA_PLL_CFG_VAL, | 521 | .pll_cfg_val = CSR50_ANA_PLL_CFG_VAL, |
@@ -549,7 +542,7 @@ struct iwl_cfg iwl5150_agn_cfg = { | |||
549 | .eeprom_calib_ver = EEPROM_5050_TX_POWER_VERSION, | 542 | .eeprom_calib_ver = EEPROM_5050_TX_POWER_VERSION, |
550 | .num_of_queues = IWLAGN_NUM_QUEUES, | 543 | .num_of_queues = IWLAGN_NUM_QUEUES, |
551 | .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES, | 544 | .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES, |
552 | .mod_params = &iwl50_mod_params, | 545 | .mod_params = &iwlagn_mod_params, |
553 | .valid_tx_ant = ANT_A, | 546 | .valid_tx_ant = ANT_A, |
554 | .valid_rx_ant = ANT_AB, | 547 | .valid_rx_ant = ANT_AB, |
555 | .pll_cfg_val = CSR50_ANA_PLL_CFG_VAL, | 548 | .pll_cfg_val = CSR50_ANA_PLL_CFG_VAL, |
@@ -576,7 +569,7 @@ struct iwl_cfg iwl5150_abg_cfg = { | |||
576 | .eeprom_calib_ver = EEPROM_5050_TX_POWER_VERSION, | 569 | .eeprom_calib_ver = EEPROM_5050_TX_POWER_VERSION, |
577 | .num_of_queues = IWLAGN_NUM_QUEUES, | 570 | .num_of_queues = IWLAGN_NUM_QUEUES, |
578 | .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES, | 571 | .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES, |
579 | .mod_params = &iwl50_mod_params, | 572 | .mod_params = &iwlagn_mod_params, |
580 | .valid_tx_ant = ANT_A, | 573 | .valid_tx_ant = ANT_A, |
581 | .valid_rx_ant = ANT_AB, | 574 | .valid_rx_ant = ANT_AB, |
582 | .pll_cfg_val = CSR50_ANA_PLL_CFG_VAL, | 575 | .pll_cfg_val = CSR50_ANA_PLL_CFG_VAL, |
@@ -592,15 +585,15 @@ struct iwl_cfg iwl5150_abg_cfg = { | |||
592 | MODULE_FIRMWARE(IWL5000_MODULE_FIRMWARE(IWL5000_UCODE_API_MAX)); | 585 | MODULE_FIRMWARE(IWL5000_MODULE_FIRMWARE(IWL5000_UCODE_API_MAX)); |
593 | MODULE_FIRMWARE(IWL5150_MODULE_FIRMWARE(IWL5150_UCODE_API_MAX)); | 586 | MODULE_FIRMWARE(IWL5150_MODULE_FIRMWARE(IWL5150_UCODE_API_MAX)); |
594 | 587 | ||
595 | module_param_named(swcrypto50, iwl50_mod_params.sw_crypto, bool, S_IRUGO); | 588 | module_param_named(swcrypto50, iwlagn_mod_params.sw_crypto, bool, S_IRUGO); |
596 | MODULE_PARM_DESC(swcrypto50, | 589 | MODULE_PARM_DESC(swcrypto50, |
597 | "using software crypto engine (default 0 [hardware])\n"); | 590 | "using software crypto engine (default 0 [hardware])\n"); |
598 | module_param_named(queues_num50, iwl50_mod_params.num_of_queues, int, S_IRUGO); | 591 | module_param_named(queues_num50, iwlagn_mod_params.num_of_queues, int, S_IRUGO); |
599 | MODULE_PARM_DESC(queues_num50, "number of hw queues in 50xx series"); | 592 | MODULE_PARM_DESC(queues_num50, "number of hw queues in 50xx series"); |
600 | module_param_named(11n_disable50, iwl50_mod_params.disable_11n, int, S_IRUGO); | 593 | module_param_named(11n_disable50, iwlagn_mod_params.disable_11n, int, S_IRUGO); |
601 | MODULE_PARM_DESC(11n_disable50, "disable 50XX 11n functionality"); | 594 | MODULE_PARM_DESC(11n_disable50, "disable 50XX 11n functionality"); |
602 | module_param_named(amsdu_size_8K50, iwl50_mod_params.amsdu_size_8K, | 595 | module_param_named(amsdu_size_8K50, iwlagn_mod_params.amsdu_size_8K, |
603 | int, S_IRUGO); | 596 | int, S_IRUGO); |
604 | MODULE_PARM_DESC(amsdu_size_8K50, "enable 8K amsdu size in 50XX series"); | 597 | MODULE_PARM_DESC(amsdu_size_8K50, "enable 8K amsdu size in 50XX series"); |
605 | module_param_named(fw_restart50, iwl50_mod_params.restart_fw, int, S_IRUGO); | 598 | module_param_named(fw_restart50, iwlagn_mod_params.restart_fw, int, S_IRUGO); |
606 | MODULE_PARM_DESC(fw_restart50, "restart firmware in case of error"); | 599 | MODULE_PARM_DESC(fw_restart50, "restart firmware in case of error"); |