diff options
author | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-08-26 02:10:56 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-08-29 15:25:33 -0400 |
commit | 6a9ae0dc1d4ed6a2007aea14e41d9ba0ae1e3fd4 (patch) | |
tree | a48d108506f4b4e655a568ce2b1bd2cc7c20f814 | |
parent | dd5b6d0a2059027366028630746d951b1e1e24b3 (diff) |
iwlagn: support small form factor SKU of 6205
Different subsystem ID
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-6000.c | 6 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.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 9487d9b550ca..c2cba80fb73f 100644 --- a/drivers/net/wireless/iwlwifi/iwl-6000.c +++ b/drivers/net/wireless/iwlwifi/iwl-6000.c | |||
@@ -396,6 +396,12 @@ struct iwl_cfg iwl6005_2bg_cfg = { | |||
396 | IWL_DEVICE_6005, | 396 | IWL_DEVICE_6005, |
397 | }; | 397 | }; |
398 | 398 | ||
399 | struct iwl_cfg iwl6005_2agn_sff_cfg = { | ||
400 | .name = "Intel(R) Centrino(R) Advanced-N 6205S AGN", | ||
401 | IWL_DEVICE_6005, | ||
402 | .ht_params = &iwl6000_ht_params, | ||
403 | }; | ||
404 | |||
399 | #define IWL_DEVICE_6030 \ | 405 | #define IWL_DEVICE_6030 \ |
400 | .fw_name_pre = IWL6030_FW_PRE, \ | 406 | .fw_name_pre = IWL6030_FW_PRE, \ |
401 | .ucode_api_max = IWL6000G2_UCODE_API_MAX, \ | 407 | .ucode_api_max = IWL6000G2_UCODE_API_MAX, \ |
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.h b/drivers/net/wireless/iwlwifi/iwl-agn.h index ea2a5fe8da8f..d2fa77adbf22 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.h +++ b/drivers/net/wireless/iwlwifi/iwl-agn.h | |||
@@ -76,6 +76,7 @@ extern struct iwl_cfg iwl5150_abg_cfg; | |||
76 | extern struct iwl_cfg iwl6005_2agn_cfg; | 76 | extern struct iwl_cfg iwl6005_2agn_cfg; |
77 | extern struct iwl_cfg iwl6005_2abg_cfg; | 77 | extern struct iwl_cfg iwl6005_2abg_cfg; |
78 | extern struct iwl_cfg iwl6005_2bg_cfg; | 78 | extern struct iwl_cfg iwl6005_2bg_cfg; |
79 | extern struct iwl_cfg iwl6005_2agn_sff_cfg; | ||
79 | extern struct iwl_cfg iwl1030_bgn_cfg; | 80 | extern struct iwl_cfg iwl1030_bgn_cfg; |
80 | extern struct iwl_cfg iwl1030_bg_cfg; | 81 | extern struct iwl_cfg iwl1030_bg_cfg; |
81 | extern struct iwl_cfg iwl6030_2agn_cfg; | 82 | 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 4b990907f26f..191c16adeeb3 100644 --- a/drivers/net/wireless/iwlwifi/iwl-pci.c +++ b/drivers/net/wireless/iwlwifi/iwl-pci.c | |||
@@ -260,6 +260,7 @@ static DEFINE_PCI_DEVICE_TABLE(iwl_hw_card_ids) = { | |||
260 | {IWL_PCI_DEVICE(0x0082, 0x1326, iwl6005_2abg_cfg)}, | 260 | {IWL_PCI_DEVICE(0x0082, 0x1326, iwl6005_2abg_cfg)}, |
261 | {IWL_PCI_DEVICE(0x0085, 0x1311, iwl6005_2agn_cfg)}, | 261 | {IWL_PCI_DEVICE(0x0085, 0x1311, iwl6005_2agn_cfg)}, |
262 | {IWL_PCI_DEVICE(0x0085, 0x1316, iwl6005_2abg_cfg)}, | 262 | {IWL_PCI_DEVICE(0x0085, 0x1316, iwl6005_2abg_cfg)}, |
263 | {IWL_PCI_DEVICE(0x0082, 0xC020, iwl6005_2agn_sff_cfg)}, | ||
263 | 264 | ||
264 | /* 6x30 Series */ | 265 | /* 6x30 Series */ |
265 | {IWL_PCI_DEVICE(0x008A, 0x5305, iwl1030_bgn_cfg)}, | 266 | {IWL_PCI_DEVICE(0x008A, 0x5305, iwl1030_bgn_cfg)}, |