From 81f7fda6d2d9f0047c04568d809dd89218915c54 Mon Sep 17 00:00:00 2001 From: Wey-Yi Guy Date: Thu, 25 Aug 2011 23:11:17 -0700 Subject: [PATCH] --- yaml --- r: 265874 b: refs/heads/master c: 1603dd495f87ae97763870d57237744d90bc2bab h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-2000.c | 5 +++++ trunk/drivers/net/wireless/iwlwifi/iwl-pci.c | 1 + trunk/drivers/net/wireless/iwlwifi/iwl-pci.h | 1 + 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index c52c6270e067..1e2948541a11 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 332a4bad975616f33c2d1bf94c4ace2ea4113835 +refs/heads/master: 1603dd495f87ae97763870d57237744d90bc2bab diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-2000.c b/trunk/drivers/net/wireless/iwlwifi/iwl-2000.c index 75ded3402e26..764d3104e128 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-2000.c +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-2000.c @@ -282,6 +282,11 @@ struct iwl_cfg iwl2000_2bg_cfg = { IWL_DEVICE_2000, }; +struct iwl_cfg iwl2000_2bgn_d_cfg = { + .name = "2000D Series 2x2 BGN", + IWL_DEVICE_2000, +}; + #define IWL_DEVICE_2030 \ .fw_name_pre = IWL2030_FW_PRE, \ .ucode_api_max = IWL2030_UCODE_API_MAX, \ diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-pci.c b/trunk/drivers/net/wireless/iwlwifi/iwl-pci.c index 7210ff68ffbc..e41f53e5c307 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-pci.c +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-pci.c @@ -332,6 +332,7 @@ static DEFINE_PCI_DEVICE_TABLE(iwl_hw_card_ids) = { {IWL_PCI_DEVICE(0x0890, 0x4026, iwl2000_2bg_cfg)}, {IWL_PCI_DEVICE(0x0891, 0x4226, iwl2000_2bg_cfg)}, {IWL_PCI_DEVICE(0x0890, 0x4426, iwl2000_2bg_cfg)}, + {IWL_PCI_DEVICE(0x0890, 0x4822, iwl2000_2bgn_d_cfg)}, /* 2x30 Series */ {IWL_PCI_DEVICE(0x0887, 0x4062, iwl2030_2bgn_cfg)}, diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-pci.h b/trunk/drivers/net/wireless/iwlwifi/iwl-pci.h index be692763e913..c0aea9e092cb 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-pci.h +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-pci.h @@ -102,6 +102,7 @@ extern struct iwl_cfg iwl130_bgn_cfg; extern struct iwl_cfg iwl130_bg_cfg; extern struct iwl_cfg iwl2000_2bgn_cfg; extern struct iwl_cfg iwl2000_2bg_cfg; +extern struct iwl_cfg iwl2000_2bgn_d_cfg; extern struct iwl_cfg iwl2030_2bgn_cfg; extern struct iwl_cfg iwl2030_2bg_cfg; extern struct iwl_cfg iwl6035_2agn_cfg;