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

Side by Side Diff: chromeos/compat-wireless/drivers/net/wireless/iwlwifi/iwl-3945.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
OLDNEW
1 /****************************************************************************** 1 /******************************************************************************
2 * 2 *
3 * Copyright(c) 2003 - 2010 Intel Corporation. All rights reserved. 3 * Copyright(c) 2003 - 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 2713 matching lines...) Expand 10 before | Expand all | Expand 10 after
2724 .num_of_queues = IWL39_NUM_QUEUES, 2724 .num_of_queues = IWL39_NUM_QUEUES,
2725 .mod_params = &iwl3945_mod_params, 2725 .mod_params = &iwl3945_mod_params,
2726 .pll_cfg_val = CSR39_ANA_PLL_CFG_VAL, 2726 .pll_cfg_val = CSR39_ANA_PLL_CFG_VAL,
2727 .set_l0s = false, 2727 .set_l0s = false,
2728 .use_bsm = true, 2728 .use_bsm = true,
2729 .use_isr_legacy = true, 2729 .use_isr_legacy = true,
2730 .ht_greenfield_support = false, 2730 .ht_greenfield_support = false,
2731 .led_compensation = 64, 2731 .led_compensation = 64,
2732 .broken_powersave = true, 2732 .broken_powersave = true,
2733 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF, 2733 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF,
2734 » .monitor_recover_period = IWL_MONITORING_PERIOD, 2734 » .monitor_recover_period = IWL_DEF_MONITORING_PERIOD,
2735 .max_event_log_size = 512, 2735 .max_event_log_size = 512,
2736 .tx_power_by_driver = true, 2736 .tx_power_by_driver = true,
2737 }; 2737 };
2738 2738
2739 static struct iwl_cfg iwl3945_abg_cfg = { 2739 static struct iwl_cfg iwl3945_abg_cfg = {
2740 .name = "3945ABG", 2740 .name = "3945ABG",
2741 .fw_name_pre = IWL3945_FW_PRE, 2741 .fw_name_pre = IWL3945_FW_PRE,
2742 .ucode_api_max = IWL3945_UCODE_API_MAX, 2742 .ucode_api_max = IWL3945_UCODE_API_MAX,
2743 .ucode_api_min = IWL3945_UCODE_API_MIN, 2743 .ucode_api_min = IWL3945_UCODE_API_MIN,
2744 .sku = IWL_SKU_A|IWL_SKU_G, 2744 .sku = IWL_SKU_A|IWL_SKU_G,
2745 .eeprom_size = IWL3945_EEPROM_IMG_SIZE, 2745 .eeprom_size = IWL3945_EEPROM_IMG_SIZE,
2746 .eeprom_ver = EEPROM_3945_EEPROM_VERSION, 2746 .eeprom_ver = EEPROM_3945_EEPROM_VERSION,
2747 .ops = &iwl3945_ops, 2747 .ops = &iwl3945_ops,
2748 .num_of_queues = IWL39_NUM_QUEUES, 2748 .num_of_queues = IWL39_NUM_QUEUES,
2749 .mod_params = &iwl3945_mod_params, 2749 .mod_params = &iwl3945_mod_params,
2750 .use_isr_legacy = true, 2750 .use_isr_legacy = true,
2751 .ht_greenfield_support = false, 2751 .ht_greenfield_support = false,
2752 .led_compensation = 64, 2752 .led_compensation = 64,
2753 .broken_powersave = true, 2753 .broken_powersave = true,
2754 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF, 2754 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF,
2755 » .monitor_recover_period = IWL_MONITORING_PERIOD, 2755 » .monitor_recover_period = IWL_DEF_MONITORING_PERIOD,
2756 .max_event_log_size = 512, 2756 .max_event_log_size = 512,
2757 .tx_power_by_driver = true, 2757 .tx_power_by_driver = true,
2758 }; 2758 };
2759 2759
2760 DEFINE_PCI_DEVICE_TABLE(iwl3945_hw_card_ids) = { 2760 DEFINE_PCI_DEVICE_TABLE(iwl3945_hw_card_ids) = {
2761 {IWL_PCI_DEVICE(0x4222, 0x1005, iwl3945_bg_cfg)}, 2761 {IWL_PCI_DEVICE(0x4222, 0x1005, iwl3945_bg_cfg)},
2762 {IWL_PCI_DEVICE(0x4222, 0x1034, iwl3945_bg_cfg)}, 2762 {IWL_PCI_DEVICE(0x4222, 0x1034, iwl3945_bg_cfg)},
2763 {IWL_PCI_DEVICE(0x4222, 0x1044, iwl3945_bg_cfg)}, 2763 {IWL_PCI_DEVICE(0x4222, 0x1044, iwl3945_bg_cfg)},
2764 {IWL_PCI_DEVICE(0x4227, 0x1014, iwl3945_bg_cfg)}, 2764 {IWL_PCI_DEVICE(0x4227, 0x1014, iwl3945_bg_cfg)},
2765 {IWL_PCI_DEVICE(0x4222, PCI_ANY_ID, iwl3945_abg_cfg)}, 2765 {IWL_PCI_DEVICE(0x4222, PCI_ANY_ID, iwl3945_abg_cfg)},
2766 {IWL_PCI_DEVICE(0x4227, PCI_ANY_ID, iwl3945_abg_cfg)}, 2766 {IWL_PCI_DEVICE(0x4227, PCI_ANY_ID, iwl3945_abg_cfg)},
2767 {0} 2767 {0}
2768 }; 2768 };
2769 2769
2770 MODULE_DEVICE_TABLE(pci, iwl3945_hw_card_ids); 2770 MODULE_DEVICE_TABLE(pci, iwl3945_hw_card_ids);
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698