diff options
| author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2012-12-24 04:10:43 -0500 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-01-03 09:28:16 -0500 |
| commit | 6ae02f3ef7f20af0237e21a979f66b13198921da (patch) | |
| tree | f2d63c5b6880b8ea7d8c460ff46b4a98b2d05c1e /drivers/net/wireless/iwlwifi/dvm/ucode.c | |
| parent | d28cbdef8cb7ea04d5ef7c9d7b14df0751560522 (diff) | |
iwlwifi: let the op_mode run a FW while in RFKILL
In some cases, the fw should run even if the NIC is in
RFKILL. Make the API more flexible to allow that.
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/dvm/ucode.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/dvm/ucode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/ucode.c b/drivers/net/wireless/iwlwifi/dvm/ucode.c index ecf700bf9842..ebec13a3329f 100644 --- a/drivers/net/wireless/iwlwifi/dvm/ucode.c +++ b/drivers/net/wireless/iwlwifi/dvm/ucode.c | |||
| @@ -343,7 +343,7 @@ int iwl_load_ucode_wait_alive(struct iwl_priv *priv, | |||
| 343 | alive_cmd, ARRAY_SIZE(alive_cmd), | 343 | alive_cmd, ARRAY_SIZE(alive_cmd), |
| 344 | iwl_alive_fn, &alive_data); | 344 | iwl_alive_fn, &alive_data); |
| 345 | 345 | ||
| 346 | ret = iwl_trans_start_fw(priv->trans, fw); | 346 | ret = iwl_trans_start_fw(priv->trans, fw, false); |
| 347 | if (ret) { | 347 | if (ret) { |
| 348 | priv->cur_ucode = old_type; | 348 | priv->cur_ucode = old_type; |
| 349 | iwl_remove_notification(&priv->notif_wait, &alive_wait); | 349 | iwl_remove_notification(&priv->notif_wait, &alive_wait); |