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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chromeos/compat-wireless/drivers/net/wireless/iwlwifi/iwl-5000.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-4965.c ('k') | chromeos/compat-wireless/drivers/net/wireless/iwlwifi/iwl-6000.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) 2007 - 2010 Intel Corporation. All rights reserved. 3 * Copyright(c) 2007 - 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 492 matching lines...) Expand 10 before | Expand all | Expand 10 after
503 .valid_rx_ant = ANT_ABC, 503 .valid_rx_ant = ANT_ABC,
504 .pll_cfg_val = CSR50_ANA_PLL_CFG_VAL, 504 .pll_cfg_val = CSR50_ANA_PLL_CFG_VAL,
505 .set_l0s = true, 505 .set_l0s = true,
506 .use_bsm = false, 506 .use_bsm = false,
507 .ht_greenfield_support = true, 507 .ht_greenfield_support = true,
508 .led_compensation = 51, 508 .led_compensation = 51,
509 .use_rts_for_aggregation = true, /* use rts/cts protection */ 509 .use_rts_for_aggregation = true, /* use rts/cts protection */
510 .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS, 510 .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
511 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF, 511 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF,
512 .chain_noise_scale = 1000, 512 .chain_noise_scale = 1000,
513 » .monitor_recover_period = IWL_MONITORING_PERIOD, 513 » .monitor_recover_period = IWL_LONG_MONITORING_PERIOD,
514 .max_event_log_size = 512, 514 .max_event_log_size = 512,
515 .ucode_tracing = true, 515 .ucode_tracing = true,
516 .sensitivity_calib_by_driver = true, 516 .sensitivity_calib_by_driver = true,
517 .chain_noise_calib_by_driver = true, 517 .chain_noise_calib_by_driver = true,
518 }; 518 };
519 519
520 struct iwl_cfg iwl5100_bgn_cfg = { 520 struct iwl_cfg iwl5100_bgn_cfg = {
521 .name = "Intel(R) WiFi Link 5100 BGN", 521 .name = "Intel(R) WiFi Link 5100 BGN",
522 .fw_name_pre = IWL5000_FW_PRE, 522 .fw_name_pre = IWL5000_FW_PRE,
523 .ucode_api_max = IWL5000_UCODE_API_MAX, 523 .ucode_api_max = IWL5000_UCODE_API_MAX,
(...skipping 10 matching lines...) Expand all
534 .valid_rx_ant = ANT_AB, 534 .valid_rx_ant = ANT_AB,
535 .pll_cfg_val = CSR50_ANA_PLL_CFG_VAL, 535 .pll_cfg_val = CSR50_ANA_PLL_CFG_VAL,
536 .set_l0s = true, 536 .set_l0s = true,
537 .use_bsm = false, 537 .use_bsm = false,
538 .ht_greenfield_support = true, 538 .ht_greenfield_support = true,
539 .led_compensation = 51, 539 .led_compensation = 51,
540 .use_rts_for_aggregation = true, /* use rts/cts protection */ 540 .use_rts_for_aggregation = true, /* use rts/cts protection */
541 .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS, 541 .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
542 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF, 542 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF,
543 .chain_noise_scale = 1000, 543 .chain_noise_scale = 1000,
544 » .monitor_recover_period = IWL_MONITORING_PERIOD, 544 » .monitor_recover_period = IWL_LONG_MONITORING_PERIOD,
545 .max_event_log_size = 512, 545 .max_event_log_size = 512,
546 .ucode_tracing = true, 546 .ucode_tracing = true,
547 .sensitivity_calib_by_driver = true, 547 .sensitivity_calib_by_driver = true,
548 .chain_noise_calib_by_driver = true, 548 .chain_noise_calib_by_driver = true,
549 }; 549 };
550 550
551 struct iwl_cfg iwl5100_abg_cfg = { 551 struct iwl_cfg iwl5100_abg_cfg = {
552 .name = "Intel(R) WiFi Link 5100 ABG", 552 .name = "Intel(R) WiFi Link 5100 ABG",
553 .fw_name_pre = IWL5000_FW_PRE, 553 .fw_name_pre = IWL5000_FW_PRE,
554 .ucode_api_max = IWL5000_UCODE_API_MAX, 554 .ucode_api_max = IWL5000_UCODE_API_MAX,
555 .ucode_api_min = IWL5000_UCODE_API_MIN, 555 .ucode_api_min = IWL5000_UCODE_API_MIN,
556 .sku = IWL_SKU_A|IWL_SKU_G, 556 .sku = IWL_SKU_A|IWL_SKU_G,
557 .ops = &iwl5000_ops, 557 .ops = &iwl5000_ops,
558 .eeprom_size = IWLAGN_EEPROM_IMG_SIZE, 558 .eeprom_size = IWLAGN_EEPROM_IMG_SIZE,
559 .eeprom_ver = EEPROM_5000_EEPROM_VERSION, 559 .eeprom_ver = EEPROM_5000_EEPROM_VERSION,
560 .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION, 560 .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,
561 .num_of_queues = IWLAGN_NUM_QUEUES, 561 .num_of_queues = IWLAGN_NUM_QUEUES,
562 .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES, 562 .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,
563 .mod_params = &iwlagn_mod_params, 563 .mod_params = &iwlagn_mod_params,
564 .valid_tx_ant = ANT_B, 564 .valid_tx_ant = ANT_B,
565 .valid_rx_ant = ANT_AB, 565 .valid_rx_ant = ANT_AB,
566 .pll_cfg_val = CSR50_ANA_PLL_CFG_VAL, 566 .pll_cfg_val = CSR50_ANA_PLL_CFG_VAL,
567 .set_l0s = true, 567 .set_l0s = true,
568 .use_bsm = false, 568 .use_bsm = false,
569 .led_compensation = 51, 569 .led_compensation = 51,
570 .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS, 570 .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
571 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF, 571 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_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 .ucode_tracing = true, 575 .ucode_tracing = true,
576 .sensitivity_calib_by_driver = true, 576 .sensitivity_calib_by_driver = true,
577 .chain_noise_calib_by_driver = true, 577 .chain_noise_calib_by_driver = true,
578 }; 578 };
579 579
580 struct iwl_cfg iwl5100_agn_cfg = { 580 struct iwl_cfg iwl5100_agn_cfg = {
581 .name = "Intel(R) WiFi Link 5100 AGN", 581 .name = "Intel(R) WiFi Link 5100 AGN",
582 .fw_name_pre = IWL5000_FW_PRE, 582 .fw_name_pre = IWL5000_FW_PRE,
583 .ucode_api_max = IWL5000_UCODE_API_MAX, 583 .ucode_api_max = IWL5000_UCODE_API_MAX,
(...skipping 10 matching lines...) Expand all
594 .valid_rx_ant = ANT_AB, 594 .valid_rx_ant = ANT_AB,
595 .pll_cfg_val = CSR50_ANA_PLL_CFG_VAL, 595 .pll_cfg_val = CSR50_ANA_PLL_CFG_VAL,
596 .set_l0s = true, 596 .set_l0s = true,
597 .use_bsm = false, 597 .use_bsm = false,
598 .ht_greenfield_support = true, 598 .ht_greenfield_support = true,
599 .led_compensation = 51, 599 .led_compensation = 51,
600 .use_rts_for_aggregation = true, /* use rts/cts protection */ 600 .use_rts_for_aggregation = true, /* use rts/cts protection */
601 .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS, 601 .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
602 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF, 602 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF,
603 .chain_noise_scale = 1000, 603 .chain_noise_scale = 1000,
604 » .monitor_recover_period = IWL_MONITORING_PERIOD, 604 » .monitor_recover_period = IWL_LONG_MONITORING_PERIOD,
605 .max_event_log_size = 512, 605 .max_event_log_size = 512,
606 .ucode_tracing = true, 606 .ucode_tracing = true,
607 .sensitivity_calib_by_driver = true, 607 .sensitivity_calib_by_driver = true,
608 .chain_noise_calib_by_driver = true, 608 .chain_noise_calib_by_driver = true,
609 }; 609 };
610 610
611 struct iwl_cfg iwl5350_agn_cfg = { 611 struct iwl_cfg iwl5350_agn_cfg = {
612 .name = "Intel(R) WiMAX/WiFi Link 5350 AGN", 612 .name = "Intel(R) WiMAX/WiFi Link 5350 AGN",
613 .fw_name_pre = IWL5000_FW_PRE, 613 .fw_name_pre = IWL5000_FW_PRE,
614 .ucode_api_max = IWL5000_UCODE_API_MAX, 614 .ucode_api_max = IWL5000_UCODE_API_MAX,
(...skipping 10 matching lines...) Expand all
625 .valid_rx_ant = ANT_ABC, 625 .valid_rx_ant = ANT_ABC,
626 .pll_cfg_val = CSR50_ANA_PLL_CFG_VAL, 626 .pll_cfg_val = CSR50_ANA_PLL_CFG_VAL,
627 .set_l0s = true, 627 .set_l0s = true,
628 .use_bsm = false, 628 .use_bsm = false,
629 .ht_greenfield_support = true, 629 .ht_greenfield_support = true,
630 .led_compensation = 51, 630 .led_compensation = 51,
631 .use_rts_for_aggregation = true, /* use rts/cts protection */ 631 .use_rts_for_aggregation = true, /* use rts/cts protection */
632 .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS, 632 .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
633 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF, 633 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF,
634 .chain_noise_scale = 1000, 634 .chain_noise_scale = 1000,
635 » .monitor_recover_period = IWL_MONITORING_PERIOD, 635 » .monitor_recover_period = IWL_LONG_MONITORING_PERIOD,
636 .max_event_log_size = 512, 636 .max_event_log_size = 512,
637 .ucode_tracing = true, 637 .ucode_tracing = true,
638 .sensitivity_calib_by_driver = true, 638 .sensitivity_calib_by_driver = true,
639 .chain_noise_calib_by_driver = true, 639 .chain_noise_calib_by_driver = true,
640 }; 640 };
641 641
642 struct iwl_cfg iwl5150_agn_cfg = { 642 struct iwl_cfg iwl5150_agn_cfg = {
643 .name = "Intel(R) WiMAX/WiFi Link 5150 AGN", 643 .name = "Intel(R) WiMAX/WiFi Link 5150 AGN",
644 .fw_name_pre = IWL5150_FW_PRE, 644 .fw_name_pre = IWL5150_FW_PRE,
645 .ucode_api_max = IWL5150_UCODE_API_MAX, 645 .ucode_api_max = IWL5150_UCODE_API_MAX,
(...skipping 10 matching lines...) Expand all
656 .valid_rx_ant = ANT_AB, 656 .valid_rx_ant = ANT_AB,
657 .pll_cfg_val = CSR50_ANA_PLL_CFG_VAL, 657 .pll_cfg_val = CSR50_ANA_PLL_CFG_VAL,
658 .set_l0s = true, 658 .set_l0s = true,
659 .use_bsm = false, 659 .use_bsm = false,
660 .ht_greenfield_support = true, 660 .ht_greenfield_support = true,
661 .led_compensation = 51, 661 .led_compensation = 51,
662 .use_rts_for_aggregation = true, /* use rts/cts protection */ 662 .use_rts_for_aggregation = true, /* use rts/cts protection */
663 .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS, 663 .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
664 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF, 664 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF,
665 .chain_noise_scale = 1000, 665 .chain_noise_scale = 1000,
666 » .monitor_recover_period = IWL_MONITORING_PERIOD, 666 » .monitor_recover_period = IWL_LONG_MONITORING_PERIOD,
667 .max_event_log_size = 512, 667 .max_event_log_size = 512,
668 .ucode_tracing = true, 668 .ucode_tracing = true,
669 .sensitivity_calib_by_driver = true, 669 .sensitivity_calib_by_driver = true,
670 .chain_noise_calib_by_driver = true, 670 .chain_noise_calib_by_driver = true,
671 .need_dc_calib = true, 671 .need_dc_calib = true,
672 }; 672 };
673 673
674 struct iwl_cfg iwl5150_abg_cfg = { 674 struct iwl_cfg iwl5150_abg_cfg = {
675 .name = "Intel(R) WiMAX/WiFi Link 5150 ABG", 675 .name = "Intel(R) WiMAX/WiFi Link 5150 ABG",
676 .fw_name_pre = IWL5150_FW_PRE, 676 .fw_name_pre = IWL5150_FW_PRE,
677 .ucode_api_max = IWL5150_UCODE_API_MAX, 677 .ucode_api_max = IWL5150_UCODE_API_MAX,
678 .ucode_api_min = IWL5150_UCODE_API_MIN, 678 .ucode_api_min = IWL5150_UCODE_API_MIN,
679 .sku = IWL_SKU_A|IWL_SKU_G, 679 .sku = IWL_SKU_A|IWL_SKU_G,
680 .ops = &iwl5150_ops, 680 .ops = &iwl5150_ops,
681 .eeprom_size = IWLAGN_EEPROM_IMG_SIZE, 681 .eeprom_size = IWLAGN_EEPROM_IMG_SIZE,
682 .eeprom_ver = EEPROM_5050_EEPROM_VERSION, 682 .eeprom_ver = EEPROM_5050_EEPROM_VERSION,
683 .eeprom_calib_ver = EEPROM_5050_TX_POWER_VERSION, 683 .eeprom_calib_ver = EEPROM_5050_TX_POWER_VERSION,
684 .num_of_queues = IWLAGN_NUM_QUEUES, 684 .num_of_queues = IWLAGN_NUM_QUEUES,
685 .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES, 685 .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,
686 .mod_params = &iwlagn_mod_params, 686 .mod_params = &iwlagn_mod_params,
687 .valid_tx_ant = ANT_A, 687 .valid_tx_ant = ANT_A,
688 .valid_rx_ant = ANT_AB, 688 .valid_rx_ant = ANT_AB,
689 .pll_cfg_val = CSR50_ANA_PLL_CFG_VAL, 689 .pll_cfg_val = CSR50_ANA_PLL_CFG_VAL,
690 .set_l0s = true, 690 .set_l0s = true,
691 .use_bsm = false, 691 .use_bsm = false,
692 .led_compensation = 51, 692 .led_compensation = 51,
693 .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS, 693 .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
694 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF, 694 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF,
695 .chain_noise_scale = 1000, 695 .chain_noise_scale = 1000,
696 » .monitor_recover_period = IWL_MONITORING_PERIOD, 696 » .monitor_recover_period = IWL_LONG_MONITORING_PERIOD,
697 .max_event_log_size = 512, 697 .max_event_log_size = 512,
698 .ucode_tracing = true, 698 .ucode_tracing = true,
699 .sensitivity_calib_by_driver = true, 699 .sensitivity_calib_by_driver = true,
700 .chain_noise_calib_by_driver = true, 700 .chain_noise_calib_by_driver = true,
701 .need_dc_calib = true, 701 .need_dc_calib = true,
702 }; 702 };
703 703
704 MODULE_FIRMWARE(IWL5000_MODULE_FIRMWARE(IWL5000_UCODE_API_MAX)); 704 MODULE_FIRMWARE(IWL5000_MODULE_FIRMWARE(IWL5000_UCODE_API_MAX));
705 MODULE_FIRMWARE(IWL5150_MODULE_FIRMWARE(IWL5150_UCODE_API_MAX)); 705 MODULE_FIRMWARE(IWL5150_MODULE_FIRMWARE(IWL5150_UCODE_API_MAX));
OLDNEW
« no previous file with comments | « chromeos/compat-wireless/drivers/net/wireless/iwlwifi/iwl-4965.c ('k') | chromeos/compat-wireless/drivers/net/wireless/iwlwifi/iwl-6000.c » ('j') | chromeos/compat-wireless/net/mac80211/mlme.c » ('J')

Powered by Google App Engine
This is Rietveld 408576698