Merge tag 'wireless-drivers-next-for-davem-2016-07-13' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next

Kalle Valo says:

====================
wireless-drivers-next patches for 4.8

Major changes:

iwlwifi

* more work on the RX path for the 9000 device series
* some more dynamic queue allocation work
* SAR BIOS implementation
* some work on debugging capabilities
* added support for GCMP encryption
* data path rework in preparation for new HW
* some cleanup to remove transport dependency on mac80211
* support for MSIx in preparation for new HW
* lots of work in preparation for HW support (9000 and a000 series)

mwifiex

* implement get_tx_power and get_antenna cfg80211 operation callbacks

wl18xx

* add support for 64bit clock

rtl8xxxu

* aggregation support (optional for now)

Also wireless-drivers is merged to fix some conflicts.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 10 insertions, 8 deletions

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
index 1cac10c5d818..dac120f8861b 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
@@ -402,7 +402,7 @@ void iwl_mvm_rx_lmac_scan_complete_notif(struct iwl_mvm *mvm,
                 mvm->scan_status &= ~IWL_MVM_SCAN_REGULAR;
                 ieee80211_scan_completed(mvm->hw, &info);
                 iwl_mvm_unref(mvm, IWL_MVM_REF_SCAN);
-                del_timer(&mvm->scan_timer);
+                cancel_delayed_work(&mvm->scan_timeout_dwork);
         } else {
                 IWL_ERR(mvm,
                         "got scan complete notification but no scan is running\n");
@@ -1225,15 +1225,16 @@ static int iwl_mvm_check_running_scans(struct iwl_mvm *mvm, int type)
         return -EIO;
 }
 
-#define SCAN_TIMEOUT (20 * HZ)
+#define SCAN_TIMEOUT 20000
 
-void iwl_mvm_scan_timeout(unsigned long data)
+void iwl_mvm_scan_timeout_wk(struct work_struct *work)
 {
-        struct iwl_mvm *mvm = (struct iwl_mvm *)data;
+        struct delayed_work *delayed_work = to_delayed_work(work);
+        struct iwl_mvm *mvm = container_of(delayed_work, struct iwl_mvm,
+                                           scan_timeout_dwork);
 
         IWL_ERR(mvm, "regular scan timed out\n");
 
-        del_timer(&mvm->scan_timer);
         iwl_force_nmi(mvm->trans);
 }
 
@@ -1316,7 +1317,8 @@ int iwl_mvm_reg_scan_start(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
         mvm->scan_status |= IWL_MVM_SCAN_REGULAR;
         iwl_mvm_ref(mvm, IWL_MVM_REF_SCAN);
 
-        mod_timer(&mvm->scan_timer, jiffies + SCAN_TIMEOUT);
+        queue_delayed_work(system_wq, &mvm->scan_timeout_dwork,
+                           msecs_to_jiffies(SCAN_TIMEOUT));
 
         return 0;
 }
@@ -1439,7 +1441,7 @@ void iwl_mvm_rx_umac_scan_complete_notif(struct iwl_mvm *mvm,
 
                 ieee80211_scan_completed(mvm->hw, &info);
                 iwl_mvm_unref(mvm, IWL_MVM_REF_SCAN);
-                del_timer(&mvm->scan_timer);
+                cancel_delayed_work(&mvm->scan_timeout_dwork);
         } else if (mvm->scan_uid_status[uid] == IWL_MVM_SCAN_SCHED) {
                 ieee80211_sched_scan_stopped(mvm->hw);
                 mvm->sched_scan_pass_all = SCHED_SCAN_PASS_ALL_DISABLED;
@@ -1644,7 +1646,7 @@ out:
                  * to release the scan reference here.
                  */
                 iwl_mvm_unref(mvm, IWL_MVM_REF_SCAN);
-                del_timer(&mvm->scan_timer);
+                cancel_delayed_work(&mvm->scan_timeout_dwork);
                 if (notify) {
                         struct cfg80211_scan_info info = {
                                 .aborted = true,