diff options
author | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-10-10 10:27:00 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-10-14 14:48:11 -0400 |
commit | 5131a600f044bc2a85cadda1eeef684fdb6b190c (patch) | |
tree | 8acda5cf0c9631b6da8f42145faaf26e20298585 /drivers/net/wireless/iwlwifi | |
parent | 78558cb4415919cae5ebc0213abd75fa86d7933b (diff) |
iwlagn: add "_d" sku to 6005 series of devices
Add additional sku to 6005 series of devices
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-6000.c | 6 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-cfg.h | 1 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-pci.c | 1 |
3 files changed, 8 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c index d81c87dff804..8e3cdd9f0c7e 100644 --- a/drivers/net/wireless/iwlwifi/iwl-6000.c +++ b/drivers/net/wireless/iwlwifi/iwl-6000.c | |||
@@ -393,6 +393,12 @@ struct iwl_cfg iwl6005_2agn_sff_cfg = { | |||
393 | .ht_params = &iwl6000_ht_params, | 393 | .ht_params = &iwl6000_ht_params, |
394 | }; | 394 | }; |
395 | 395 | ||
396 | struct iwl_cfg iwl6005_2agn_d_cfg = { | ||
397 | .name = "Intel(R) Centrino(R) Advanced-N 6205D AGN", | ||
398 | IWL_DEVICE_6005, | ||
399 | .ht_params = &iwl6000_ht_params, | ||
400 | }; | ||
401 | |||
396 | #define IWL_DEVICE_6030 \ | 402 | #define IWL_DEVICE_6030 \ |
397 | .fw_name_pre = IWL6030_FW_PRE, \ | 403 | .fw_name_pre = IWL6030_FW_PRE, \ |
398 | .ucode_api_max = IWL6000G2_UCODE_API_MAX, \ | 404 | .ucode_api_max = IWL6000G2_UCODE_API_MAX, \ |
diff --git a/drivers/net/wireless/iwlwifi/iwl-cfg.h b/drivers/net/wireless/iwlwifi/iwl-cfg.h index d4f317cfe8b5..df2ff32251f9 100644 --- a/drivers/net/wireless/iwlwifi/iwl-cfg.h +++ b/drivers/net/wireless/iwlwifi/iwl-cfg.h | |||
@@ -79,6 +79,7 @@ extern struct iwl_cfg iwl6005_2agn_cfg; | |||
79 | extern struct iwl_cfg iwl6005_2abg_cfg; | 79 | extern struct iwl_cfg iwl6005_2abg_cfg; |
80 | extern struct iwl_cfg iwl6005_2bg_cfg; | 80 | extern struct iwl_cfg iwl6005_2bg_cfg; |
81 | extern struct iwl_cfg iwl6005_2agn_sff_cfg; | 81 | extern struct iwl_cfg iwl6005_2agn_sff_cfg; |
82 | extern struct iwl_cfg iwl6005_2agn_d_cfg; | ||
82 | extern struct iwl_cfg iwl1030_bgn_cfg; | 83 | extern struct iwl_cfg iwl1030_bgn_cfg; |
83 | extern struct iwl_cfg iwl1030_bg_cfg; | 84 | extern struct iwl_cfg iwl1030_bg_cfg; |
84 | extern struct iwl_cfg iwl6030_2agn_cfg; | 85 | extern struct iwl_cfg iwl6030_2agn_cfg; |
diff --git a/drivers/net/wireless/iwlwifi/iwl-pci.c b/drivers/net/wireless/iwlwifi/iwl-pci.c index 1d7bb7423f94..11c09e59b85f 100644 --- a/drivers/net/wireless/iwlwifi/iwl-pci.c +++ b/drivers/net/wireless/iwlwifi/iwl-pci.c | |||
@@ -254,6 +254,7 @@ static DEFINE_PCI_DEVICE_TABLE(iwl_hw_card_ids) = { | |||
254 | {IWL_PCI_DEVICE(0x0085, 0x1316, iwl6005_2abg_cfg)}, | 254 | {IWL_PCI_DEVICE(0x0085, 0x1316, iwl6005_2abg_cfg)}, |
255 | {IWL_PCI_DEVICE(0x0082, 0xC020, iwl6005_2agn_sff_cfg)}, | 255 | {IWL_PCI_DEVICE(0x0082, 0xC020, iwl6005_2agn_sff_cfg)}, |
256 | {IWL_PCI_DEVICE(0x0085, 0xC220, iwl6005_2agn_sff_cfg)}, | 256 | {IWL_PCI_DEVICE(0x0085, 0xC220, iwl6005_2agn_sff_cfg)}, |
257 | {IWL_PCI_DEVICE(0x0082, 0x1341, iwl6005_2agn_d_cfg)}, | ||
257 | 258 | ||
258 | /* 6x30 Series */ | 259 | /* 6x30 Series */ |
259 | {IWL_PCI_DEVICE(0x008A, 0x5305, iwl1030_bgn_cfg)}, | 260 | {IWL_PCI_DEVICE(0x008A, 0x5305, iwl1030_bgn_cfg)}, |