Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(110)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chromeos/compat-wireless/drivers/net/wireless/iwlwifi/iwl-6000.c

Issue 5326002: Update compat-wireless to 2.6.36-5-spn (Closed) Base URL: http://git.chromium.org/git/kernel.git@master
Patch Set: Fixes for !ACK handling, missing local changes, log message fixes Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chromeos/compat-wireless/drivers/net/wireless/iwlwifi/iwl-5000.c ('k') | chromeos/compat-wireless/drivers/net/wireless/iwlwifi/iwl-agn.c » ('j') | chromeos/compat-wireless/net/mac80211/mlme.c » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /****************************************************************************** 1 /******************************************************************************
2 * 2 *
3 * Copyright(c) 2008 - 2010 Intel Corporation. All rights reserved. 3 * Copyright(c) 2008 - 2010 Intel Corporation. All rights reserved.
4 * 4 *
5 * This program is free software; you can redistribute it and/or modify it 5 * This program is free software; you can redistribute it and/or modify it
6 * under the terms of version 2 of the GNU General Public License as 6 * under the terms of version 2 of the GNU General Public License as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
8 * 8 *
9 * This program is distributed in the hope that it will be useful, but WITHOUT 9 * This program is distributed in the hope that it will be useful, but WITHOUT
10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
(...skipping 370 matching lines...) Expand 10 before | Expand all | Expand 10 after
381 .shadow_ram_support = true, 381 .shadow_ram_support = true,
382 .ht_greenfield_support = true, 382 .ht_greenfield_support = true,
383 .led_compensation = 51, 383 .led_compensation = 51,
384 .use_rts_for_aggregation = true, /* use rts/cts protection */ 384 .use_rts_for_aggregation = true, /* use rts/cts protection */
385 .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS, 385 .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
386 .supports_idle = true, 386 .supports_idle = true,
387 .adv_thermal_throttle = true, 387 .adv_thermal_throttle = true,
388 .support_ct_kill_exit = true, 388 .support_ct_kill_exit = true,
389 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF, 389 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
390 .chain_noise_scale = 1000, 390 .chain_noise_scale = 1000,
391 » .monitor_recover_period = IWL_MONITORING_PERIOD, 391 » .monitor_recover_period = IWL_DEF_MONITORING_PERIOD,
392 .max_event_log_size = 512, 392 .max_event_log_size = 512,
393 .ucode_tracing = true, 393 .ucode_tracing = true,
394 .sensitivity_calib_by_driver = true, 394 .sensitivity_calib_by_driver = true,
395 .chain_noise_calib_by_driver = true, 395 .chain_noise_calib_by_driver = true,
396 .need_dc_calib = true, 396 .need_dc_calib = true,
397 }; 397 };
398 398
399 struct iwl_cfg iwl6000g2a_2abg_cfg = { 399 struct iwl_cfg iwl6000g2a_2abg_cfg = {
400 .name = "6000 Series 2x2 ABG Gen2a", 400 .name = "6000 Series 2x2 ABG Gen2a",
401 .fw_name_pre = IWL6000G2A_FW_PRE, 401 .fw_name_pre = IWL6000G2A_FW_PRE,
(...skipping 15 matching lines...) Expand all
417 .pa_type = IWL_PA_SYSTEM, 417 .pa_type = IWL_PA_SYSTEM,
418 .max_ll_items = OTP_MAX_LL_ITEMS_6x00, 418 .max_ll_items = OTP_MAX_LL_ITEMS_6x00,
419 .shadow_ram_support = true, 419 .shadow_ram_support = true,
420 .led_compensation = 51, 420 .led_compensation = 51,
421 .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS, 421 .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
422 .supports_idle = true, 422 .supports_idle = true,
423 .adv_thermal_throttle = true, 423 .adv_thermal_throttle = true,
424 .support_ct_kill_exit = true, 424 .support_ct_kill_exit = true,
425 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF, 425 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
426 .chain_noise_scale = 1000, 426 .chain_noise_scale = 1000,
427 » .monitor_recover_period = IWL_MONITORING_PERIOD, 427 » .monitor_recover_period = IWL_DEF_MONITORING_PERIOD,
428 .max_event_log_size = 512, 428 .max_event_log_size = 512,
429 .sensitivity_calib_by_driver = true, 429 .sensitivity_calib_by_driver = true,
430 .chain_noise_calib_by_driver = true, 430 .chain_noise_calib_by_driver = true,
431 .need_dc_calib = true, 431 .need_dc_calib = true,
432 }; 432 };
433 433
434 struct iwl_cfg iwl6000g2a_2bg_cfg = { 434 struct iwl_cfg iwl6000g2a_2bg_cfg = {
435 .name = "6000 Series 2x2 BG Gen2a", 435 .name = "6000 Series 2x2 BG Gen2a",
436 .fw_name_pre = IWL6000G2A_FW_PRE, 436 .fw_name_pre = IWL6000G2A_FW_PRE,
437 .ucode_api_max = IWL6000G2_UCODE_API_MAX, 437 .ucode_api_max = IWL6000G2_UCODE_API_MAX,
(...skipping 14 matching lines...) Expand all
452 .pa_type = IWL_PA_SYSTEM, 452 .pa_type = IWL_PA_SYSTEM,
453 .max_ll_items = OTP_MAX_LL_ITEMS_6x00, 453 .max_ll_items = OTP_MAX_LL_ITEMS_6x00,
454 .shadow_ram_support = true, 454 .shadow_ram_support = true,
455 .led_compensation = 51, 455 .led_compensation = 51,
456 .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS, 456 .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
457 .supports_idle = true, 457 .supports_idle = true,
458 .adv_thermal_throttle = true, 458 .adv_thermal_throttle = true,
459 .support_ct_kill_exit = true, 459 .support_ct_kill_exit = true,
460 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF, 460 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
461 .chain_noise_scale = 1000, 461 .chain_noise_scale = 1000,
462 » .monitor_recover_period = IWL_MONITORING_PERIOD, 462 » .monitor_recover_period = IWL_DEF_MONITORING_PERIOD,
463 .max_event_log_size = 512, 463 .max_event_log_size = 512,
464 .sensitivity_calib_by_driver = true, 464 .sensitivity_calib_by_driver = true,
465 .chain_noise_calib_by_driver = true, 465 .chain_noise_calib_by_driver = true,
466 .need_dc_calib = true, 466 .need_dc_calib = true,
467 }; 467 };
468 468
469 struct iwl_cfg iwl6000g2b_2agn_cfg = { 469 struct iwl_cfg iwl6000g2b_2agn_cfg = {
470 .name = "6000 Series 2x2 AGN Gen2b", 470 .name = "6000 Series 2x2 AGN Gen2b",
471 .fw_name_pre = IWL6000G2B_FW_PRE, 471 .fw_name_pre = IWL6000G2B_FW_PRE,
472 .ucode_api_max = IWL6000G2_UCODE_API_MAX, 472 .ucode_api_max = IWL6000G2_UCODE_API_MAX,
(...skipping 16 matching lines...) Expand all
489 .shadow_ram_support = true, 489 .shadow_ram_support = true,
490 .ht_greenfield_support = true, 490 .ht_greenfield_support = true,
491 .led_compensation = 51, 491 .led_compensation = 51,
492 .use_rts_for_aggregation = true, /* use rts/cts protection */ 492 .use_rts_for_aggregation = true, /* use rts/cts protection */
493 .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS, 493 .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
494 .supports_idle = true, 494 .supports_idle = true,
495 .adv_thermal_throttle = true, 495 .adv_thermal_throttle = true,
496 .support_ct_kill_exit = true, 496 .support_ct_kill_exit = true,
497 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF, 497 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
498 .chain_noise_scale = 1000, 498 .chain_noise_scale = 1000,
499 » .monitor_recover_period = IWL_MONITORING_PERIOD, 499 » .monitor_recover_period = IWL_LONG_MONITORING_PERIOD,
500 .max_event_log_size = 512, 500 .max_event_log_size = 512,
501 .sensitivity_calib_by_driver = true, 501 .sensitivity_calib_by_driver = true,
502 .chain_noise_calib_by_driver = true, 502 .chain_noise_calib_by_driver = true,
503 .need_dc_calib = true, 503 .need_dc_calib = true,
504 .bt_statistics = true, 504 .bt_statistics = true,
505 }; 505 };
506 506
507 struct iwl_cfg iwl6000g2b_2abg_cfg = { 507 struct iwl_cfg iwl6000g2b_2abg_cfg = {
508 .name = "6000 Series 2x2 ABG Gen2b", 508 .name = "6000 Series 2x2 ABG Gen2b",
509 .fw_name_pre = IWL6000G2B_FW_PRE, 509 .fw_name_pre = IWL6000G2B_FW_PRE,
(...skipping 15 matching lines...) Expand all
525 .pa_type = IWL_PA_SYSTEM, 525 .pa_type = IWL_PA_SYSTEM,
526 .max_ll_items = OTP_MAX_LL_ITEMS_6x00, 526 .max_ll_items = OTP_MAX_LL_ITEMS_6x00,
527 .shadow_ram_support = true, 527 .shadow_ram_support = true,
528 .led_compensation = 51, 528 .led_compensation = 51,
529 .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS, 529 .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
530 .supports_idle = true, 530 .supports_idle = true,
531 .adv_thermal_throttle = true, 531 .adv_thermal_throttle = true,
532 .support_ct_kill_exit = true, 532 .support_ct_kill_exit = true,
533 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF, 533 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
534 .chain_noise_scale = 1000, 534 .chain_noise_scale = 1000,
535 » .monitor_recover_period = IWL_MONITORING_PERIOD, 535 » .monitor_recover_period = IWL_LONG_MONITORING_PERIOD,
536 .max_event_log_size = 512, 536 .max_event_log_size = 512,
537 .sensitivity_calib_by_driver = true, 537 .sensitivity_calib_by_driver = true,
538 .chain_noise_calib_by_driver = true, 538 .chain_noise_calib_by_driver = true,
539 .need_dc_calib = true, 539 .need_dc_calib = true,
540 .bt_statistics = true, 540 .bt_statistics = true,
541 }; 541 };
542 542
543 struct iwl_cfg iwl6000g2b_2bgn_cfg = { 543 struct iwl_cfg iwl6000g2b_2bgn_cfg = {
544 .name = "6000 Series 2x2 BGN Gen2b", 544 .name = "6000 Series 2x2 BGN Gen2b",
545 .fw_name_pre = IWL6000G2B_FW_PRE, 545 .fw_name_pre = IWL6000G2B_FW_PRE,
(...skipping 17 matching lines...) Expand all
563 .shadow_ram_support = true, 563 .shadow_ram_support = true,
564 .ht_greenfield_support = true, 564 .ht_greenfield_support = true,
565 .led_compensation = 51, 565 .led_compensation = 51,
566 .use_rts_for_aggregation = true, /* use rts/cts protection */ 566 .use_rts_for_aggregation = true, /* use rts/cts protection */
567 .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS, 567 .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
568 .supports_idle = true, 568 .supports_idle = true,
569 .adv_thermal_throttle = true, 569 .adv_thermal_throttle = true,
570 .support_ct_kill_exit = true, 570 .support_ct_kill_exit = true,
571 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF, 571 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
572 .chain_noise_scale = 1000, 572 .chain_noise_scale = 1000,
573 » .monitor_recover_period = IWL_MONITORING_PERIOD, 573 » .monitor_recover_period = IWL_LONG_MONITORING_PERIOD,
574 .max_event_log_size = 512, 574 .max_event_log_size = 512,
575 .sensitivity_calib_by_driver = true, 575 .sensitivity_calib_by_driver = true,
576 .chain_noise_calib_by_driver = true, 576 .chain_noise_calib_by_driver = true,
577 .need_dc_calib = true, 577 .need_dc_calib = true,
578 .bt_statistics = true, 578 .bt_statistics = true,
579 }; 579 };
580 580
581 struct iwl_cfg iwl6000g2b_2bg_cfg = { 581 struct iwl_cfg iwl6000g2b_2bg_cfg = {
582 .name = "6000 Series 2x2 BG Gen2b", 582 .name = "6000 Series 2x2 BG Gen2b",
583 .fw_name_pre = IWL6000G2B_FW_PRE, 583 .fw_name_pre = IWL6000G2B_FW_PRE,
(...skipping 15 matching lines...) Expand all
599 .pa_type = IWL_PA_SYSTEM, 599 .pa_type = IWL_PA_SYSTEM,
600 .max_ll_items = OTP_MAX_LL_ITEMS_6x00, 600 .max_ll_items = OTP_MAX_LL_ITEMS_6x00,
601 .shadow_ram_support = true, 601 .shadow_ram_support = true,
602 .led_compensation = 51, 602 .led_compensation = 51,
603 .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS, 603 .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
604 .supports_idle = true, 604 .supports_idle = true,
605 .adv_thermal_throttle = true, 605 .adv_thermal_throttle = true,
606 .support_ct_kill_exit = true, 606 .support_ct_kill_exit = true,
607 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF, 607 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
608 .chain_noise_scale = 1000, 608 .chain_noise_scale = 1000,
609 » .monitor_recover_period = IWL_MONITORING_PERIOD, 609 » .monitor_recover_period = IWL_LONG_MONITORING_PERIOD,
610 .max_event_log_size = 512, 610 .max_event_log_size = 512,
611 .sensitivity_calib_by_driver = true, 611 .sensitivity_calib_by_driver = true,
612 .chain_noise_calib_by_driver = true, 612 .chain_noise_calib_by_driver = true,
613 .need_dc_calib = true, 613 .need_dc_calib = true,
614 .bt_statistics = true, 614 .bt_statistics = true,
615 }; 615 };
616 616
617 struct iwl_cfg iwl6000g2b_bgn_cfg = { 617 struct iwl_cfg iwl6000g2b_bgn_cfg = {
618 .name = "6000 Series 1x2 BGN Gen2b", 618 .name = "6000 Series 1x2 BGN Gen2b",
619 .fw_name_pre = IWL6000G2B_FW_PRE, 619 .fw_name_pre = IWL6000G2B_FW_PRE,
(...skipping 17 matching lines...) Expand all
637 .shadow_ram_support = true, 637 .shadow_ram_support = true,
638 .ht_greenfield_support = true, 638 .ht_greenfield_support = true,
639 .led_compensation = 51, 639 .led_compensation = 51,
640 .use_rts_for_aggregation = true, /* use rts/cts protection */ 640 .use_rts_for_aggregation = true, /* use rts/cts protection */
641 .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS, 641 .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
642 .supports_idle = true, 642 .supports_idle = true,
643 .adv_thermal_throttle = true, 643 .adv_thermal_throttle = true,
644 .support_ct_kill_exit = true, 644 .support_ct_kill_exit = true,
645 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF, 645 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
646 .chain_noise_scale = 1000, 646 .chain_noise_scale = 1000,
647 » .monitor_recover_period = IWL_MONITORING_PERIOD, 647 » .monitor_recover_period = IWL_LONG_MONITORING_PERIOD,
648 .max_event_log_size = 512, 648 .max_event_log_size = 512,
649 .sensitivity_calib_by_driver = true, 649 .sensitivity_calib_by_driver = true,
650 .chain_noise_calib_by_driver = true, 650 .chain_noise_calib_by_driver = true,
651 .need_dc_calib = true, 651 .need_dc_calib = true,
652 .bt_statistics = true, 652 .bt_statistics = true,
653 }; 653 };
654 654
655 struct iwl_cfg iwl6000g2b_bg_cfg = { 655 struct iwl_cfg iwl6000g2b_bg_cfg = {
656 .name = "6000 Series 1x2 BG Gen2b", 656 .name = "6000 Series 1x2 BG Gen2b",
657 .fw_name_pre = IWL6000G2B_FW_PRE, 657 .fw_name_pre = IWL6000G2B_FW_PRE,
(...skipping 15 matching lines...) Expand all
673 .pa_type = IWL_PA_SYSTEM, 673 .pa_type = IWL_PA_SYSTEM,
674 .max_ll_items = OTP_MAX_LL_ITEMS_6x00, 674 .max_ll_items = OTP_MAX_LL_ITEMS_6x00,
675 .shadow_ram_support = true, 675 .shadow_ram_support = true,
676 .led_compensation = 51, 676 .led_compensation = 51,
677 .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS, 677 .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
678 .supports_idle = true, 678 .supports_idle = true,
679 .adv_thermal_throttle = true, 679 .adv_thermal_throttle = true,
680 .support_ct_kill_exit = true, 680 .support_ct_kill_exit = true,
681 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF, 681 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
682 .chain_noise_scale = 1000, 682 .chain_noise_scale = 1000,
683 » .monitor_recover_period = IWL_MONITORING_PERIOD, 683 » .monitor_recover_period = IWL_LONG_MONITORING_PERIOD,
684 .max_event_log_size = 512, 684 .max_event_log_size = 512,
685 .sensitivity_calib_by_driver = true, 685 .sensitivity_calib_by_driver = true,
686 .chain_noise_calib_by_driver = true, 686 .chain_noise_calib_by_driver = true,
687 .need_dc_calib = true, 687 .need_dc_calib = true,
688 .bt_statistics = true, 688 .bt_statistics = true,
689 }; 689 };
690 690
691 /* 691 /*
692 * "i": Internal configuration, use internal Power Amplifier 692 * "i": Internal configuration, use internal Power Amplifier
693 */ 693 */
(...skipping 20 matching lines...) Expand all
714 .shadow_ram_support = true, 714 .shadow_ram_support = true,
715 .ht_greenfield_support = true, 715 .ht_greenfield_support = true,
716 .led_compensation = 51, 716 .led_compensation = 51,
717 .use_rts_for_aggregation = true, /* use rts/cts protection */ 717 .use_rts_for_aggregation = true, /* use rts/cts protection */
718 .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS, 718 .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
719 .supports_idle = true, 719 .supports_idle = true,
720 .adv_thermal_throttle = true, 720 .adv_thermal_throttle = true,
721 .support_ct_kill_exit = true, 721 .support_ct_kill_exit = true,
722 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF, 722 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
723 .chain_noise_scale = 1000, 723 .chain_noise_scale = 1000,
724 » .monitor_recover_period = IWL_MONITORING_PERIOD, 724 » .monitor_recover_period = IWL_DEF_MONITORING_PERIOD,
725 .max_event_log_size = 1024, 725 .max_event_log_size = 1024,
726 .ucode_tracing = true, 726 .ucode_tracing = true,
727 .sensitivity_calib_by_driver = true, 727 .sensitivity_calib_by_driver = true,
728 .chain_noise_calib_by_driver = true, 728 .chain_noise_calib_by_driver = true,
729 }; 729 };
730 730
731 struct iwl_cfg iwl6000i_2abg_cfg = { 731 struct iwl_cfg iwl6000i_2abg_cfg = {
732 .name = "Intel(R) Centrino(R) Advanced-N 6200 ABG", 732 .name = "Intel(R) Centrino(R) Advanced-N 6200 ABG",
733 .fw_name_pre = IWL6000_FW_PRE, 733 .fw_name_pre = IWL6000_FW_PRE,
734 .ucode_api_max = IWL6000_UCODE_API_MAX, 734 .ucode_api_max = IWL6000_UCODE_API_MAX,
(...skipping 14 matching lines...) Expand all
749 .pa_type = IWL_PA_INTERNAL, 749 .pa_type = IWL_PA_INTERNAL,
750 .max_ll_items = OTP_MAX_LL_ITEMS_6x00, 750 .max_ll_items = OTP_MAX_LL_ITEMS_6x00,
751 .shadow_ram_support = true, 751 .shadow_ram_support = true,
752 .led_compensation = 51, 752 .led_compensation = 51,
753 .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS, 753 .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
754 .supports_idle = true, 754 .supports_idle = true,
755 .adv_thermal_throttle = true, 755 .adv_thermal_throttle = true,
756 .support_ct_kill_exit = true, 756 .support_ct_kill_exit = true,
757 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF, 757 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
758 .chain_noise_scale = 1000, 758 .chain_noise_scale = 1000,
759 » .monitor_recover_period = IWL_MONITORING_PERIOD, 759 » .monitor_recover_period = IWL_DEF_MONITORING_PERIOD,
760 .max_event_log_size = 1024, 760 .max_event_log_size = 1024,
761 .ucode_tracing = true, 761 .ucode_tracing = true,
762 .sensitivity_calib_by_driver = true, 762 .sensitivity_calib_by_driver = true,
763 .chain_noise_calib_by_driver = true, 763 .chain_noise_calib_by_driver = true,
764 }; 764 };
765 765
766 struct iwl_cfg iwl6000i_2bg_cfg = { 766 struct iwl_cfg iwl6000i_2bg_cfg = {
767 .name = "Intel(R) Centrino(R) Advanced-N 6200 BG", 767 .name = "Intel(R) Centrino(R) Advanced-N 6200 BG",
768 .fw_name_pre = IWL6000_FW_PRE, 768 .fw_name_pre = IWL6000_FW_PRE,
769 .ucode_api_max = IWL6000_UCODE_API_MAX, 769 .ucode_api_max = IWL6000_UCODE_API_MAX,
(...skipping 14 matching lines...) Expand all
784 .pa_type = IWL_PA_INTERNAL, 784 .pa_type = IWL_PA_INTERNAL,
785 .max_ll_items = OTP_MAX_LL_ITEMS_6x00, 785 .max_ll_items = OTP_MAX_LL_ITEMS_6x00,
786 .shadow_ram_support = true, 786 .shadow_ram_support = true,
787 .led_compensation = 51, 787 .led_compensation = 51,
788 .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS, 788 .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
789 .supports_idle = true, 789 .supports_idle = true,
790 .adv_thermal_throttle = true, 790 .adv_thermal_throttle = true,
791 .support_ct_kill_exit = true, 791 .support_ct_kill_exit = true,
792 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF, 792 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
793 .chain_noise_scale = 1000, 793 .chain_noise_scale = 1000,
794 » .monitor_recover_period = IWL_MONITORING_PERIOD, 794 » .monitor_recover_period = IWL_DEF_MONITORING_PERIOD,
795 .max_event_log_size = 1024, 795 .max_event_log_size = 1024,
796 .ucode_tracing = true, 796 .ucode_tracing = true,
797 .sensitivity_calib_by_driver = true, 797 .sensitivity_calib_by_driver = true,
798 .chain_noise_calib_by_driver = true, 798 .chain_noise_calib_by_driver = true,
799 }; 799 };
800 800
801 struct iwl_cfg iwl6050_2agn_cfg = { 801 struct iwl_cfg iwl6050_2agn_cfg = {
802 .name = "Intel(R) Centrino(R) Advanced-N + WiMAX 6250 AGN", 802 .name = "Intel(R) Centrino(R) Advanced-N + WiMAX 6250 AGN",
803 .fw_name_pre = IWL6050_FW_PRE, 803 .fw_name_pre = IWL6050_FW_PRE,
804 .ucode_api_max = IWL6050_UCODE_API_MAX, 804 .ucode_api_max = IWL6050_UCODE_API_MAX,
(...skipping 16 matching lines...) Expand all
821 .shadow_ram_support = true, 821 .shadow_ram_support = true,
822 .ht_greenfield_support = true, 822 .ht_greenfield_support = true,
823 .led_compensation = 51, 823 .led_compensation = 51,
824 .use_rts_for_aggregation = true, /* use rts/cts protection */ 824 .use_rts_for_aggregation = true, /* use rts/cts protection */
825 .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS, 825 .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
826 .supports_idle = true, 826 .supports_idle = true,
827 .adv_thermal_throttle = true, 827 .adv_thermal_throttle = true,
828 .support_ct_kill_exit = true, 828 .support_ct_kill_exit = true,
829 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF, 829 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
830 .chain_noise_scale = 1500, 830 .chain_noise_scale = 1500,
831 » .monitor_recover_period = IWL_MONITORING_PERIOD, 831 » .monitor_recover_period = IWL_DEF_MONITORING_PERIOD,
832 .max_event_log_size = 1024, 832 .max_event_log_size = 1024,
833 .ucode_tracing = true, 833 .ucode_tracing = true,
834 .sensitivity_calib_by_driver = true, 834 .sensitivity_calib_by_driver = true,
835 .chain_noise_calib_by_driver = true, 835 .chain_noise_calib_by_driver = true,
836 .need_dc_calib = true, 836 .need_dc_calib = true,
837 }; 837 };
838 838
839 struct iwl_cfg iwl6050g2_bgn_cfg = { 839 struct iwl_cfg iwl6050g2_bgn_cfg = {
840 .name = "6050 Series 1x2 BGN Gen2", 840 .name = "6050 Series 1x2 BGN Gen2",
841 .fw_name_pre = IWL6050_FW_PRE, 841 .fw_name_pre = IWL6050_FW_PRE,
(...skipping 17 matching lines...) Expand all
859 .shadow_ram_support = true, 859 .shadow_ram_support = true,
860 .ht_greenfield_support = true, 860 .ht_greenfield_support = true,
861 .led_compensation = 51, 861 .led_compensation = 51,
862 .use_rts_for_aggregation = true, /* use rts/cts protection */ 862 .use_rts_for_aggregation = true, /* use rts/cts protection */
863 .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS, 863 .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
864 .supports_idle = true, 864 .supports_idle = true,
865 .adv_thermal_throttle = true, 865 .adv_thermal_throttle = true,
866 .support_ct_kill_exit = true, 866 .support_ct_kill_exit = true,
867 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF, 867 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
868 .chain_noise_scale = 1500, 868 .chain_noise_scale = 1500,
869 » .monitor_recover_period = IWL_MONITORING_PERIOD, 869 » .monitor_recover_period = IWL_DEF_MONITORING_PERIOD,
870 .max_event_log_size = 1024, 870 .max_event_log_size = 1024,
871 .ucode_tracing = true, 871 .ucode_tracing = true,
872 .sensitivity_calib_by_driver = true, 872 .sensitivity_calib_by_driver = true,
873 .chain_noise_calib_by_driver = true, 873 .chain_noise_calib_by_driver = true,
874 .need_dc_calib = true, 874 .need_dc_calib = true,
875 }; 875 };
876 876
877 struct iwl_cfg iwl6050_2abg_cfg = { 877 struct iwl_cfg iwl6050_2abg_cfg = {
878 .name = "Intel(R) Centrino(R) Advanced-N + WiMAX 6250 ABG", 878 .name = "Intel(R) Centrino(R) Advanced-N + WiMAX 6250 ABG",
879 .fw_name_pre = IWL6050_FW_PRE, 879 .fw_name_pre = IWL6050_FW_PRE,
(...skipping 15 matching lines...) Expand all
895 .pa_type = IWL_PA_SYSTEM, 895 .pa_type = IWL_PA_SYSTEM,
896 .max_ll_items = OTP_MAX_LL_ITEMS_6x50, 896 .max_ll_items = OTP_MAX_LL_ITEMS_6x50,
897 .shadow_ram_support = true, 897 .shadow_ram_support = true,
898 .led_compensation = 51, 898 .led_compensation = 51,
899 .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS, 899 .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
900 .supports_idle = true, 900 .supports_idle = true,
901 .adv_thermal_throttle = true, 901 .adv_thermal_throttle = true,
902 .support_ct_kill_exit = true, 902 .support_ct_kill_exit = true,
903 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF, 903 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
904 .chain_noise_scale = 1500, 904 .chain_noise_scale = 1500,
905 » .monitor_recover_period = IWL_MONITORING_PERIOD, 905 » .monitor_recover_period = IWL_DEF_MONITORING_PERIOD,
906 .max_event_log_size = 1024, 906 .max_event_log_size = 1024,
907 .ucode_tracing = true, 907 .ucode_tracing = true,
908 .sensitivity_calib_by_driver = true, 908 .sensitivity_calib_by_driver = true,
909 .chain_noise_calib_by_driver = true, 909 .chain_noise_calib_by_driver = true,
910 .need_dc_calib = true, 910 .need_dc_calib = true,
911 }; 911 };
912 912
913 struct iwl_cfg iwl6000_3agn_cfg = { 913 struct iwl_cfg iwl6000_3agn_cfg = {
914 .name = "Intel(R) Centrino(R) Ultimate-N 6300 AGN", 914 .name = "Intel(R) Centrino(R) Ultimate-N 6300 AGN",
915 .fw_name_pre = IWL6000_FW_PRE, 915 .fw_name_pre = IWL6000_FW_PRE,
(...skipping 17 matching lines...) Expand all
933 .shadow_ram_support = true, 933 .shadow_ram_support = true,
934 .ht_greenfield_support = true, 934 .ht_greenfield_support = true,
935 .led_compensation = 51, 935 .led_compensation = 51,
936 .use_rts_for_aggregation = true, /* use rts/cts protection */ 936 .use_rts_for_aggregation = true, /* use rts/cts protection */
937 .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS, 937 .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
938 .supports_idle = true, 938 .supports_idle = true,
939 .adv_thermal_throttle = true, 939 .adv_thermal_throttle = true,
940 .support_ct_kill_exit = true, 940 .support_ct_kill_exit = true,
941 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF, 941 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
942 .chain_noise_scale = 1000, 942 .chain_noise_scale = 1000,
943 » .monitor_recover_period = IWL_MONITORING_PERIOD, 943 » .monitor_recover_period = IWL_DEF_MONITORING_PERIOD,
944 .max_event_log_size = 1024, 944 .max_event_log_size = 1024,
945 .ucode_tracing = true, 945 .ucode_tracing = true,
946 .sensitivity_calib_by_driver = true, 946 .sensitivity_calib_by_driver = true,
947 .chain_noise_calib_by_driver = true, 947 .chain_noise_calib_by_driver = true,
948 }; 948 };
949 949
950 MODULE_FIRMWARE(IWL6000_MODULE_FIRMWARE(IWL6000_UCODE_API_MAX)); 950 MODULE_FIRMWARE(IWL6000_MODULE_FIRMWARE(IWL6000_UCODE_API_MAX));
951 MODULE_FIRMWARE(IWL6050_MODULE_FIRMWARE(IWL6050_UCODE_API_MAX)); 951 MODULE_FIRMWARE(IWL6050_MODULE_FIRMWARE(IWL6050_UCODE_API_MAX));
952 MODULE_FIRMWARE(IWL6000G2A_MODULE_FIRMWARE(IWL6000G2_UCODE_API_MAX)); 952 MODULE_FIRMWARE(IWL6000G2A_MODULE_FIRMWARE(IWL6000G2_UCODE_API_MAX));
953 MODULE_FIRMWARE(IWL6000G2B_MODULE_FIRMWARE(IWL6000G2_UCODE_API_MAX)); 953 MODULE_FIRMWARE(IWL6000G2B_MODULE_FIRMWARE(IWL6000G2_UCODE_API_MAX));
OLDNEW
« no previous file with comments | « chromeos/compat-wireless/drivers/net/wireless/iwlwifi/iwl-5000.c ('k') | chromeos/compat-wireless/drivers/net/wireless/iwlwifi/iwl-agn.c » ('j') | chromeos/compat-wireless/net/mac80211/mlme.c » ('J')

Powered by Google App Engine
This is Rietveld 408576698