diff options
| author | Luca Coelho | 2016-05-03 11:18:33 +0200 |
|---|---|---|
| committer | Luca Coelho | 2016-07-05 23:33:07 +0200 |
| commit | 69e046423ad71de625ac1b0f0f390d3b9727b8c9 (patch) | |
| tree | 44d0dca7de152334772d447dd040710f68e597ad /drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | |
| parent | iwlwifi: mvm: fix possible division by zero (diff) | |
| download | kernel-qcow2-linux-69e046423ad71de625ac1b0f0f390d3b9727b8c9.tar.gz kernel-qcow2-linux-69e046423ad71de625ac1b0f0f390d3b9727b8c9.tar.xz kernel-qcow2-linux-69e046423ad71de625ac1b0f0f390d3b9727b8c9.zip | |
iwlwifi: mvm: change scan timeout to a delayed work
Some transports may sleep when writing to registers, which is done
when calling iwl_force_nmi(). So we can't call iwl_force_nmi() in a
timer context. To solve that, convert the scan timeout timer to a
delayed work.
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/mvm/mvm.h')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h index bf7d78e0e14a..3775e26b7d9d 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h +++ b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h @@ -802,7 +802,7 @@ struct iwl_mvm { struct iwl_mcast_filter_cmd *mcast_filter_cmd; enum iwl_mvm_scan_type scan_type; enum iwl_mvm_sched_scan_pass_all_states sched_scan_pass_all; - struct timer_list scan_timer; + struct delayed_work scan_timeout_dwork; /* max number of simultaneous scans the FW supports */ unsigned int max_scans; @@ -1415,7 +1415,7 @@ int iwl_mvm_scan_size(struct iwl_mvm *mvm); int iwl_mvm_scan_stop(struct iwl_mvm *mvm, int type, bool notify); int iwl_mvm_max_scan_ie_len(struct iwl_mvm *mvm); void iwl_mvm_report_scan_aborted(struct iwl_mvm *mvm); -void iwl_mvm_scan_timeout(unsigned long data); +void iwl_mvm_scan_timeout_wk(struct work_struct *work); /* Scheduled scan */ void iwl_mvm_rx_lmac_scan_complete_notif(struct iwl_mvm *mvm, |