diff options
author | Oren Givon <oren.givon@intel.com> | 2014-12-23 03:39:48 -0500 |
---|---|---|
committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2015-01-22 10:53:55 -0500 |
commit | 9b8a7a90773c4d25d64f7e81bf32f465659d3567 (patch) | |
tree | 63c171cf2c93c30cd1188c3f924ca44f6e6eee19 /drivers/net/wireless | |
parent | fb2380a206eae822b17be63e30b5451db992e290 (diff) |
iwlwifi: add new config and PCI IDs for 4165 series
Add a new config for 4165 series over PCI and insert support
for two new 4165 series PCI IDs.
Signed-off-by: Oren Givon <oren.givon@intel.com>
Reviewed-by: Liad Kaufman <liad.kaufman@intel.com>
Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-8000.c | 10 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-config.h | 1 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/pcie/drv.c | 2 |
3 files changed, 13 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-8000.c b/drivers/net/wireless/iwlwifi/iwl-8000.c index 46e9c9ac6ba2..9eca5337ffde 100644 --- a/drivers/net/wireless/iwlwifi/iwl-8000.c +++ b/drivers/net/wireless/iwlwifi/iwl-8000.c | |||
@@ -156,6 +156,16 @@ const struct iwl_cfg iwl8260_2ac_cfg = { | |||
156 | .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K, | 156 | .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K, |
157 | }; | 157 | }; |
158 | 158 | ||
159 | const struct iwl_cfg iwl4165_2ac_cfg = { | ||
160 | .name = "Intel(R) Dual Band Wireless AC 4165", | ||
161 | .fw_name_pre = IWL8000_FW_PRE, | ||
162 | IWL_DEVICE_8000, | ||
163 | .ht_params = &iwl8000_ht_params, | ||
164 | .nvm_ver = IWL8000_NVM_VERSION, | ||
165 | .nvm_calib_ver = IWL8000_TX_POWER_VERSION, | ||
166 | .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K, | ||
167 | }; | ||
168 | |||
159 | const struct iwl_cfg iwl8260_2ac_sdio_cfg = { | 169 | const struct iwl_cfg iwl8260_2ac_sdio_cfg = { |
160 | .name = "Intel(R) Dual Band Wireless-AC 8260", | 170 | .name = "Intel(R) Dual Band Wireless-AC 8260", |
161 | .fw_name_pre = IWL8000_FW_PRE, | 171 | .fw_name_pre = IWL8000_FW_PRE, |
diff --git a/drivers/net/wireless/iwlwifi/iwl-config.h b/drivers/net/wireless/iwlwifi/iwl-config.h index fa0bc4845e1a..0eaafd88d97b 100644 --- a/drivers/net/wireless/iwlwifi/iwl-config.h +++ b/drivers/net/wireless/iwlwifi/iwl-config.h | |||
@@ -378,6 +378,7 @@ extern const struct iwl_cfg iwl7265d_2n_cfg; | |||
378 | extern const struct iwl_cfg iwl7265d_n_cfg; | 378 | extern const struct iwl_cfg iwl7265d_n_cfg; |
379 | extern const struct iwl_cfg iwl8260_2n_cfg; | 379 | extern const struct iwl_cfg iwl8260_2n_cfg; |
380 | extern const struct iwl_cfg iwl8260_2ac_cfg; | 380 | extern const struct iwl_cfg iwl8260_2ac_cfg; |
381 | extern const struct iwl_cfg iwl4165_2ac_cfg; | ||
381 | extern const struct iwl_cfg iwl8260_2ac_sdio_cfg; | 382 | extern const struct iwl_cfg iwl8260_2ac_sdio_cfg; |
382 | extern const struct iwl_cfg iwl4165_2ac_sdio_cfg; | 383 | extern const struct iwl_cfg iwl4165_2ac_sdio_cfg; |
383 | #endif /* CONFIG_IWLMVM */ | 384 | #endif /* CONFIG_IWLMVM */ |
diff --git a/drivers/net/wireless/iwlwifi/pcie/drv.c b/drivers/net/wireless/iwlwifi/pcie/drv.c index 3ee8e3848876..c7820aa6aaea 100644 --- a/drivers/net/wireless/iwlwifi/pcie/drv.c +++ b/drivers/net/wireless/iwlwifi/pcie/drv.c | |||
@@ -411,6 +411,8 @@ static const struct pci_device_id iwl_hw_card_ids[] = { | |||
411 | {IWL_PCI_DEVICE(0x24F3, 0x0010, iwl8260_2ac_cfg)}, | 411 | {IWL_PCI_DEVICE(0x24F3, 0x0010, iwl8260_2ac_cfg)}, |
412 | {IWL_PCI_DEVICE(0x24F3, 0x0004, iwl8260_2n_cfg)}, | 412 | {IWL_PCI_DEVICE(0x24F3, 0x0004, iwl8260_2n_cfg)}, |
413 | {IWL_PCI_DEVICE(0x24F4, 0x0030, iwl8260_2ac_cfg)}, | 413 | {IWL_PCI_DEVICE(0x24F4, 0x0030, iwl8260_2ac_cfg)}, |
414 | {IWL_PCI_DEVICE(0x24F5, 0x0010, iwl4165_2ac_cfg)}, | ||
415 | {IWL_PCI_DEVICE(0x24F6, 0x0030, iwl4165_2ac_cfg)}, | ||
414 | #endif /* CONFIG_IWLMVM */ | 416 | #endif /* CONFIG_IWLMVM */ |
415 | 417 | ||
416 | {0} | 418 | {0} |