summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/iwlwifi/dvm/agn.h
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2013-05-17 12:36:29 +0400
committerJohannes Berg <johannes.berg@intel.com>2013-05-27 15:11:42 +0400
commit0d8877a10d65f3c9bb84ad150e524d95ebd377fb (patch)
tree628329246e509f0a574b0fa017f2f55489e1b4c9 /drivers/net/wireless/iwlwifi/dvm/agn.h
parentee4d5471333c323693f79cdb7b145b40e12baa77 (diff)
downloadlinux-0d8877a10d65f3c9bb84ad150e524d95ebd377fb.tar.xz
iwlwifi: move some configuration parameters into DVM
There are a number of parameters that aren't really hardware specific but rather define how the DVM firmware is used. Move these into the DVM configuration. Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/dvm/agn.h')
-rw-r--r--drivers/net/wireless/iwlwifi/dvm/agn.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/agn.h b/drivers/net/wireless/iwlwifi/dvm/agn.h
index ff47fce6c58e..df64a546f52d 100644
--- a/drivers/net/wireless/iwlwifi/dvm/agn.h
+++ b/drivers/net/wireless/iwlwifi/dvm/agn.h
@@ -78,10 +78,13 @@
/* device operations */
extern struct iwl_dvm_cfg iwl_dvm_1000_cfg;
extern struct iwl_dvm_cfg iwl_dvm_2000_cfg;
+extern struct iwl_dvm_cfg iwl_dvm_105_cfg;
extern struct iwl_dvm_cfg iwl_dvm_2030_cfg;
extern struct iwl_dvm_cfg iwl_dvm_5000_cfg;
extern struct iwl_dvm_cfg iwl_dvm_5150_cfg;
extern struct iwl_dvm_cfg iwl_dvm_6000_cfg;
+extern struct iwl_dvm_cfg iwl_dvm_6005_cfg;
+extern struct iwl_dvm_cfg iwl_dvm_6050_cfg;
extern struct iwl_dvm_cfg iwl_dvm_6030_cfg;
@@ -291,8 +294,8 @@ void iwlagn_bt_adjust_rssi_monitor(struct iwl_priv *priv, bool rssi_ena);
static inline bool iwl_advanced_bt_coexist(struct iwl_priv *priv)
{
- return priv->cfg->bt_params &&
- priv->cfg->bt_params->advanced_bt_coexist;
+ return priv->lib->bt_params &&
+ priv->lib->bt_params->advanced_bt_coexist;
}
#ifdef CONFIG_IWLWIFI_DEBUG