aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorWey-Yi Guy <wey-yi.w.guy@intel.com>2011-10-10 10:27:01 -0400
committerJohn W. Linville <linville@tuxdriver.com>2011-10-14 14:48:11 -0400
commitb319d3eb964a602dd1f77bd04b033c40f896e06f (patch)
tree17e3b6ab0b3834d54137cc71a2a532ea49de072e /drivers/net
parent5131a600f044bc2a85cadda1eeef684fdb6b190c (diff)
iwlagn: Add "_d" sku to 105 series of devices
Add additional sku to 105 series 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')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-2000.c6
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-cfg.h1
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-pci.c1
3 files changed, 8 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-2000.c b/drivers/net/wireless/iwlwifi/iwl-2000.c
index 09a6b8e86b8..c7634b2d263 100644
--- a/drivers/net/wireless/iwlwifi/iwl-2000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-2000.c
@@ -340,6 +340,12 @@ struct iwl_cfg iwl105_bgn_cfg = {
340 .ht_params = &iwl2000_ht_params, 340 .ht_params = &iwl2000_ht_params,
341}; 341};
342 342
343struct iwl_cfg iwl105_bgn_d_cfg = {
344 .name = "105D Series 1x1 BGN",
345 IWL_DEVICE_105,
346 .ht_params = &iwl2000_ht_params,
347};
348
343#define IWL_DEVICE_135 \ 349#define IWL_DEVICE_135 \
344 .fw_name_pre = IWL135_FW_PRE, \ 350 .fw_name_pre = IWL135_FW_PRE, \
345 .ucode_api_max = IWL135_UCODE_API_MAX, \ 351 .ucode_api_max = IWL135_UCODE_API_MAX, \
diff --git a/drivers/net/wireless/iwlwifi/iwl-cfg.h b/drivers/net/wireless/iwlwifi/iwl-cfg.h
index df2ff32251f..2a2dc4597ba 100644
--- a/drivers/net/wireless/iwlwifi/iwl-cfg.h
+++ b/drivers/net/wireless/iwlwifi/iwl-cfg.h
@@ -110,6 +110,7 @@ extern struct iwl_cfg iwl6035_2abg_cfg;
110extern struct iwl_cfg iwl6035_2bg_cfg; 110extern struct iwl_cfg iwl6035_2bg_cfg;
111extern struct iwl_cfg iwl105_bg_cfg; 111extern struct iwl_cfg iwl105_bg_cfg;
112extern struct iwl_cfg iwl105_bgn_cfg; 112extern struct iwl_cfg iwl105_bgn_cfg;
113extern struct iwl_cfg iwl105_bgn_d_cfg;
113extern struct iwl_cfg iwl135_bg_cfg; 114extern struct iwl_cfg iwl135_bg_cfg;
114extern struct iwl_cfg iwl135_bgn_cfg; 115extern struct iwl_cfg iwl135_bgn_cfg;
115 116
diff --git a/drivers/net/wireless/iwlwifi/iwl-pci.c b/drivers/net/wireless/iwlwifi/iwl-pci.c
index 11c09e59b85..3b6cc66365e 100644
--- a/drivers/net/wireless/iwlwifi/iwl-pci.c
+++ b/drivers/net/wireless/iwlwifi/iwl-pci.c
@@ -355,6 +355,7 @@ static DEFINE_PCI_DEVICE_TABLE(iwl_hw_card_ids) = {
355 {IWL_PCI_DEVICE(0x0894, 0x0026, iwl105_bg_cfg)}, 355 {IWL_PCI_DEVICE(0x0894, 0x0026, iwl105_bg_cfg)},
356 {IWL_PCI_DEVICE(0x0895, 0x0226, iwl105_bg_cfg)}, 356 {IWL_PCI_DEVICE(0x0895, 0x0226, iwl105_bg_cfg)},
357 {IWL_PCI_DEVICE(0x0894, 0x0426, iwl105_bg_cfg)}, 357 {IWL_PCI_DEVICE(0x0894, 0x0426, iwl105_bg_cfg)},
358 {IWL_PCI_DEVICE(0x0894, 0x0822, iwl105_bgn_d_cfg)},
358 359
359/* 135 Series */ 360/* 135 Series */
360 {IWL_PCI_DEVICE(0x0892, 0x0062, iwl135_bgn_cfg)}, 361 {IWL_PCI_DEVICE(0x0892, 0x0062, iwl135_bgn_cfg)},