aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-6000.c
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2010-08-24 16:35:40 -0400
committerJohn W. Linville <linville@tuxdriver.com>2010-08-24 16:35:40 -0400
commit268bae0b6879f238ba57f5f801958d1254e136f7 (patch)
tree132d1039370644b2c6a2d2f8903024de3e47b020 /drivers/net/wireless/iwlwifi/iwl-6000.c
parentd70e96932de55fb2c05b1c0af1dff178651a9b77 (diff)
parent6a017e043a8c5e4f1e7c1152bc6477da8066f5f6 (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts: drivers/net/wireless/iwlwifi/iwl-core.c drivers/net/wireless/iwlwifi/iwl-core.h
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-6000.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-6000.c32
1 files changed, 16 insertions, 16 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c
index e0c6c3afba27..9e390f698641 100644
--- a/drivers/net/wireless/iwlwifi/iwl-6000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-6000.c
@@ -393,7 +393,7 @@ struct iwl_cfg iwl6000g2a_2agn_cfg = {
393 .support_ct_kill_exit = true, 393 .support_ct_kill_exit = true,
394 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF, 394 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
395 .chain_noise_scale = 1000, 395 .chain_noise_scale = 1000,
396 .monitor_recover_period = IWL_MONITORING_PERIOD, 396 .monitor_recover_period = IWL_DEF_MONITORING_PERIOD,
397 .max_event_log_size = 512, 397 .max_event_log_size = 512,
398 .ucode_tracing = true, 398 .ucode_tracing = true,
399 .sensitivity_calib_by_driver = true, 399 .sensitivity_calib_by_driver = true,
@@ -429,7 +429,7 @@ struct iwl_cfg iwl6000g2a_2abg_cfg = {
429 .support_ct_kill_exit = true, 429 .support_ct_kill_exit = true,
430 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF, 430 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
431 .chain_noise_scale = 1000, 431 .chain_noise_scale = 1000,
432 .monitor_recover_period = IWL_MONITORING_PERIOD, 432 .monitor_recover_period = IWL_DEF_MONITORING_PERIOD,
433 .max_event_log_size = 512, 433 .max_event_log_size = 512,
434 .sensitivity_calib_by_driver = true, 434 .sensitivity_calib_by_driver = true,
435 .chain_noise_calib_by_driver = true, 435 .chain_noise_calib_by_driver = true,
@@ -464,7 +464,7 @@ struct iwl_cfg iwl6000g2a_2bg_cfg = {
464 .support_ct_kill_exit = true, 464 .support_ct_kill_exit = true,
465 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF, 465 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
466 .chain_noise_scale = 1000, 466 .chain_noise_scale = 1000,
467 .monitor_recover_period = IWL_MONITORING_PERIOD, 467 .monitor_recover_period = IWL_DEF_MONITORING_PERIOD,
468 .max_event_log_size = 512, 468 .max_event_log_size = 512,
469 .sensitivity_calib_by_driver = true, 469 .sensitivity_calib_by_driver = true,
470 .chain_noise_calib_by_driver = true, 470 .chain_noise_calib_by_driver = true,
@@ -501,7 +501,7 @@ struct iwl_cfg iwl6000g2b_2agn_cfg = {
501 .support_ct_kill_exit = true, 501 .support_ct_kill_exit = true,
502 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF, 502 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
503 .chain_noise_scale = 1000, 503 .chain_noise_scale = 1000,
504 .monitor_recover_period = IWL_MONITORING_PERIOD, 504 .monitor_recover_period = IWL_LONG_MONITORING_PERIOD,
505 .max_event_log_size = 512, 505 .max_event_log_size = 512,
506 .sensitivity_calib_by_driver = true, 506 .sensitivity_calib_by_driver = true,
507 .chain_noise_calib_by_driver = true, 507 .chain_noise_calib_by_driver = true,
@@ -537,7 +537,7 @@ struct iwl_cfg iwl6000g2b_2abg_cfg = {
537 .support_ct_kill_exit = true, 537 .support_ct_kill_exit = true,
538 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF, 538 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
539 .chain_noise_scale = 1000, 539 .chain_noise_scale = 1000,
540 .monitor_recover_period = IWL_MONITORING_PERIOD, 540 .monitor_recover_period = IWL_LONG_MONITORING_PERIOD,
541 .max_event_log_size = 512, 541 .max_event_log_size = 512,
542 .sensitivity_calib_by_driver = true, 542 .sensitivity_calib_by_driver = true,
543 .chain_noise_calib_by_driver = true, 543 .chain_noise_calib_by_driver = true,
@@ -575,7 +575,7 @@ struct iwl_cfg iwl6000g2b_2bgn_cfg = {
575 .support_ct_kill_exit = true, 575 .support_ct_kill_exit = true,
576 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF, 576 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
577 .chain_noise_scale = 1000, 577 .chain_noise_scale = 1000,
578 .monitor_recover_period = IWL_MONITORING_PERIOD, 578 .monitor_recover_period = IWL_LONG_MONITORING_PERIOD,
579 .max_event_log_size = 512, 579 .max_event_log_size = 512,
580 .sensitivity_calib_by_driver = true, 580 .sensitivity_calib_by_driver = true,
581 .chain_noise_calib_by_driver = true, 581 .chain_noise_calib_by_driver = true,
@@ -611,7 +611,7 @@ struct iwl_cfg iwl6000g2b_2bg_cfg = {
611 .support_ct_kill_exit = true, 611 .support_ct_kill_exit = true,
612 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF, 612 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
613 .chain_noise_scale = 1000, 613 .chain_noise_scale = 1000,
614 .monitor_recover_period = IWL_MONITORING_PERIOD, 614 .monitor_recover_period = IWL_LONG_MONITORING_PERIOD,
615 .max_event_log_size = 512, 615 .max_event_log_size = 512,
616 .sensitivity_calib_by_driver = true, 616 .sensitivity_calib_by_driver = true,
617 .chain_noise_calib_by_driver = true, 617 .chain_noise_calib_by_driver = true,
@@ -649,7 +649,7 @@ struct iwl_cfg iwl6000g2b_bgn_cfg = {
649 .support_ct_kill_exit = true, 649 .support_ct_kill_exit = true,
650 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF, 650 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
651 .chain_noise_scale = 1000, 651 .chain_noise_scale = 1000,
652 .monitor_recover_period = IWL_MONITORING_PERIOD, 652 .monitor_recover_period = IWL_LONG_MONITORING_PERIOD,
653 .max_event_log_size = 512, 653 .max_event_log_size = 512,
654 .sensitivity_calib_by_driver = true, 654 .sensitivity_calib_by_driver = true,
655 .chain_noise_calib_by_driver = true, 655 .chain_noise_calib_by_driver = true,
@@ -685,7 +685,7 @@ struct iwl_cfg iwl6000g2b_bg_cfg = {
685 .support_ct_kill_exit = true, 685 .support_ct_kill_exit = true,
686 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF, 686 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
687 .chain_noise_scale = 1000, 687 .chain_noise_scale = 1000,
688 .monitor_recover_period = IWL_MONITORING_PERIOD, 688 .monitor_recover_period = IWL_LONG_MONITORING_PERIOD,
689 .max_event_log_size = 512, 689 .max_event_log_size = 512,
690 .sensitivity_calib_by_driver = true, 690 .sensitivity_calib_by_driver = true,
691 .chain_noise_calib_by_driver = true, 691 .chain_noise_calib_by_driver = true,
@@ -726,7 +726,7 @@ struct iwl_cfg iwl6000i_2agn_cfg = {
726 .support_ct_kill_exit = true, 726 .support_ct_kill_exit = true,
727 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF, 727 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
728 .chain_noise_scale = 1000, 728 .chain_noise_scale = 1000,
729 .monitor_recover_period = IWL_MONITORING_PERIOD, 729 .monitor_recover_period = IWL_DEF_MONITORING_PERIOD,
730 .max_event_log_size = 1024, 730 .max_event_log_size = 1024,
731 .ucode_tracing = true, 731 .ucode_tracing = true,
732 .sensitivity_calib_by_driver = true, 732 .sensitivity_calib_by_driver = true,
@@ -761,7 +761,7 @@ struct iwl_cfg iwl6000i_2abg_cfg = {
761 .support_ct_kill_exit = true, 761 .support_ct_kill_exit = true,
762 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF, 762 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
763 .chain_noise_scale = 1000, 763 .chain_noise_scale = 1000,
764 .monitor_recover_period = IWL_MONITORING_PERIOD, 764 .monitor_recover_period = IWL_DEF_MONITORING_PERIOD,
765 .max_event_log_size = 1024, 765 .max_event_log_size = 1024,
766 .ucode_tracing = true, 766 .ucode_tracing = true,
767 .sensitivity_calib_by_driver = true, 767 .sensitivity_calib_by_driver = true,
@@ -796,7 +796,7 @@ struct iwl_cfg iwl6000i_2bg_cfg = {
796 .support_ct_kill_exit = true, 796 .support_ct_kill_exit = true,
797 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF, 797 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
798 .chain_noise_scale = 1000, 798 .chain_noise_scale = 1000,
799 .monitor_recover_period = IWL_MONITORING_PERIOD, 799 .monitor_recover_period = IWL_DEF_MONITORING_PERIOD,
800 .max_event_log_size = 1024, 800 .max_event_log_size = 1024,
801 .ucode_tracing = true, 801 .ucode_tracing = true,
802 .sensitivity_calib_by_driver = true, 802 .sensitivity_calib_by_driver = true,
@@ -833,7 +833,7 @@ struct iwl_cfg iwl6050_2agn_cfg = {
833 .support_ct_kill_exit = true, 833 .support_ct_kill_exit = true,
834 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF, 834 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
835 .chain_noise_scale = 1500, 835 .chain_noise_scale = 1500,
836 .monitor_recover_period = IWL_MONITORING_PERIOD, 836 .monitor_recover_period = IWL_DEF_MONITORING_PERIOD,
837 .max_event_log_size = 1024, 837 .max_event_log_size = 1024,
838 .ucode_tracing = true, 838 .ucode_tracing = true,
839 .sensitivity_calib_by_driver = true, 839 .sensitivity_calib_by_driver = true,
@@ -871,7 +871,7 @@ struct iwl_cfg iwl6050g2_bgn_cfg = {
871 .support_ct_kill_exit = true, 871 .support_ct_kill_exit = true,
872 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF, 872 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
873 .chain_noise_scale = 1500, 873 .chain_noise_scale = 1500,
874 .monitor_recover_period = IWL_MONITORING_PERIOD, 874 .monitor_recover_period = IWL_DEF_MONITORING_PERIOD,
875 .max_event_log_size = 1024, 875 .max_event_log_size = 1024,
876 .ucode_tracing = true, 876 .ucode_tracing = true,
877 .sensitivity_calib_by_driver = true, 877 .sensitivity_calib_by_driver = true,
@@ -907,7 +907,7 @@ struct iwl_cfg iwl6050_2abg_cfg = {
907 .support_ct_kill_exit = true, 907 .support_ct_kill_exit = true,
908 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF, 908 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
909 .chain_noise_scale = 1500, 909 .chain_noise_scale = 1500,
910 .monitor_recover_period = IWL_MONITORING_PERIOD, 910 .monitor_recover_period = IWL_DEF_MONITORING_PERIOD,
911 .max_event_log_size = 1024, 911 .max_event_log_size = 1024,
912 .ucode_tracing = true, 912 .ucode_tracing = true,
913 .sensitivity_calib_by_driver = true, 913 .sensitivity_calib_by_driver = true,
@@ -945,7 +945,7 @@ struct iwl_cfg iwl6000_3agn_cfg = {
945 .support_ct_kill_exit = true, 945 .support_ct_kill_exit = true,
946 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF, 946 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
947 .chain_noise_scale = 1000, 947 .chain_noise_scale = 1000,
948 .monitor_recover_period = IWL_MONITORING_PERIOD, 948 .monitor_recover_period = IWL_DEF_MONITORING_PERIOD,
949 .max_event_log_size = 1024, 949 .max_event_log_size = 1024,
950 .ucode_tracing = true, 950 .ucode_tracing = true,
951 .sensitivity_calib_by_driver = true, 951 .sensitivity_calib_by_driver = true,
generated by cgit v1.2.2 (git 2.25.0) at 2025-01-09 20:28:48 -0500