summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/mvm/mvm.h
diff options
context:
space:
mode:
authorEytan Lifshitz2013-09-11 12:39:18 +0200
committerJohannes Berg2013-10-11 09:56:58 +0200
commit81a67e32c444f05b9f7ba5d33c9221db9d0133e1 (patch)
tree35dc981ffa2be4eb0916151a578de85c75eba7f2 /drivers/net/wireless/iwlwifi/mvm/mvm.h
parentiwlwifi: mvm: Add device wide power command (diff)
downloadkernel-qcow2-linux-81a67e32c444f05b9f7ba5d33c9221db9d0133e1.tar.gz
kernel-qcow2-linux-81a67e32c444f05b9f7ba5d33c9221db9d0133e1.tar.xz
kernel-qcow2-linux-81a67e32c444f05b9f7ba5d33c9221db9d0133e1.zip
iwlwifi: mvm: prevent the NIC to be powered at driver load time.
Some NICs aren't allowed to be powered up at driver load time. Fix it, and move the external NVM loading from driver load time to driver up time (parsing the external nvm file remains at driver load time). Signed-off-by: Eytan Lifshitz <eytan.lifshitz@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/mvm.h')
-rw-r--r--drivers/net/wireless/iwlwifi/mvm/mvm.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/mvm.h b/drivers/net/wireless/iwlwifi/mvm/mvm.h
index a5d609749755..6bce6e168ae4 100644
--- a/drivers/net/wireless/iwlwifi/mvm/mvm.h
+++ b/drivers/net/wireless/iwlwifi/mvm/mvm.h
@@ -629,6 +629,7 @@ int iwl_mvm_rx_statistics(struct iwl_mvm *mvm,
/* NVM */
int iwl_nvm_init(struct iwl_mvm *mvm);
+int iwl_mvm_load_nvm_to_nic(struct iwl_mvm *mvm);
int iwl_mvm_up(struct iwl_mvm *mvm);
int iwl_mvm_load_d3_fw(struct iwl_mvm *mvm);