diff options
author | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-08-26 02:11:17 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-08-29 15:30:30 -0400 |
commit | 1603dd495f87ae97763870d57237744d90bc2bab (patch) | |
tree | 6a32ba114be8356ee2bdcf3f2740bb6ae3b417cc | |
parent | 332a4bad975616f33c2d1bf94c4ace2ea4113835 (diff) |
iwlagn: adding special "D" SKU for 2000 series
One more sku for 2000 series with 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-2000.c | 5 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-pci.c | 1 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-pci.h | 1 |
3 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-2000.c b/drivers/net/wireless/iwlwifi/iwl-2000.c index 75ded3402e26..764d3104e128 100644 --- a/drivers/net/wireless/iwlwifi/iwl-2000.c +++ b/drivers/net/wireless/iwlwifi/iwl-2000.c | |||
@@ -282,6 +282,11 @@ struct iwl_cfg iwl2000_2bg_cfg = { | |||
282 | IWL_DEVICE_2000, | 282 | IWL_DEVICE_2000, |
283 | }; | 283 | }; |
284 | 284 | ||
285 | struct iwl_cfg iwl2000_2bgn_d_cfg = { | ||
286 | .name = "2000D Series 2x2 BGN", | ||
287 | IWL_DEVICE_2000, | ||
288 | }; | ||
289 | |||
285 | #define IWL_DEVICE_2030 \ | 290 | #define IWL_DEVICE_2030 \ |
286 | .fw_name_pre = IWL2030_FW_PRE, \ | 291 | .fw_name_pre = IWL2030_FW_PRE, \ |
287 | .ucode_api_max = IWL2030_UCODE_API_MAX, \ | 292 | .ucode_api_max = IWL2030_UCODE_API_MAX, \ |
diff --git a/drivers/net/wireless/iwlwifi/iwl-pci.c b/drivers/net/wireless/iwlwifi/iwl-pci.c index 7210ff68ffbc..e41f53e5c307 100644 --- a/drivers/net/wireless/iwlwifi/iwl-pci.c +++ b/drivers/net/wireless/iwlwifi/iwl-pci.c | |||
@@ -332,6 +332,7 @@ static DEFINE_PCI_DEVICE_TABLE(iwl_hw_card_ids) = { | |||
332 | {IWL_PCI_DEVICE(0x0890, 0x4026, iwl2000_2bg_cfg)}, | 332 | {IWL_PCI_DEVICE(0x0890, 0x4026, iwl2000_2bg_cfg)}, |
333 | {IWL_PCI_DEVICE(0x0891, 0x4226, iwl2000_2bg_cfg)}, | 333 | {IWL_PCI_DEVICE(0x0891, 0x4226, iwl2000_2bg_cfg)}, |
334 | {IWL_PCI_DEVICE(0x0890, 0x4426, iwl2000_2bg_cfg)}, | 334 | {IWL_PCI_DEVICE(0x0890, 0x4426, iwl2000_2bg_cfg)}, |
335 | {IWL_PCI_DEVICE(0x0890, 0x4822, iwl2000_2bgn_d_cfg)}, | ||
335 | 336 | ||
336 | /* 2x30 Series */ | 337 | /* 2x30 Series */ |
337 | {IWL_PCI_DEVICE(0x0887, 0x4062, iwl2030_2bgn_cfg)}, | 338 | {IWL_PCI_DEVICE(0x0887, 0x4062, iwl2030_2bgn_cfg)}, |
diff --git a/drivers/net/wireless/iwlwifi/iwl-pci.h b/drivers/net/wireless/iwlwifi/iwl-pci.h index be692763e913..c0aea9e092cb 100644 --- a/drivers/net/wireless/iwlwifi/iwl-pci.h +++ b/drivers/net/wireless/iwlwifi/iwl-pci.h | |||
@@ -102,6 +102,7 @@ extern struct iwl_cfg iwl130_bgn_cfg; | |||
102 | extern struct iwl_cfg iwl130_bg_cfg; | 102 | extern struct iwl_cfg iwl130_bg_cfg; |
103 | extern struct iwl_cfg iwl2000_2bgn_cfg; | 103 | extern struct iwl_cfg iwl2000_2bgn_cfg; |
104 | extern struct iwl_cfg iwl2000_2bg_cfg; | 104 | extern struct iwl_cfg iwl2000_2bg_cfg; |
105 | extern struct iwl_cfg iwl2000_2bgn_d_cfg; | ||
105 | extern struct iwl_cfg iwl2030_2bgn_cfg; | 106 | extern struct iwl_cfg iwl2030_2bgn_cfg; |
106 | extern struct iwl_cfg iwl2030_2bg_cfg; | 107 | extern struct iwl_cfg iwl2030_2bg_cfg; |
107 | extern struct iwl_cfg iwl6035_2agn_cfg; | 108 | extern struct iwl_cfg iwl6035_2agn_cfg; |