iwlwifi: mvm: add D0i3 ref/unref for ROC commands
authorEliad Peller <eliad@wizery.com>
Mon, 28 Oct 2013 11:13:56 +0000 (13:13 +0200)
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Mon, 3 Feb 2014 20:23:40 +0000 (22:23 +0200)
Take a reference when ROC command is started, and
unref it on completion.

Signed-off-by: Eliad Peller <eliadx.peller@intel.com>
Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
drivers/net/wireless/iwlwifi/mvm/mvm.h
drivers/net/wireless/iwlwifi/mvm/time-event.c

index 3a3e9f18a2ed8610f617d9cba73b4fd3ae59950d..19a90d12701173b8ae4c66f80d6761f13d8714df 100644 (file)
@@ -242,6 +242,7 @@ enum iwl_mvm_smps_type_request {
 enum iwl_mvm_ref_type {
        IWL_MVM_REF_UCODE_DOWN,
        IWL_MVM_REF_SCAN,
+       IWL_MVM_REF_ROC,
 
        IWL_MVM_REF_COUNT,
 };
index b4c2abaa297bd6cf760d4cd3adaa4f0468dcdad0..e145dd41e85ec7d7e95ecf05257aac7a4dee8875 100644 (file)
@@ -126,6 +126,7 @@ static void iwl_mvm_roc_finished(struct iwl_mvm *mvm)
         * in iwl_mvm_te_handle_notif).
         */
        clear_bit(IWL_MVM_STATUS_ROC_RUNNING, &mvm->status);
+       iwl_mvm_unref(mvm, IWL_MVM_REF_ROC);
 
        /*
         * Of course, our status bit is just as racy as mac80211, so in
@@ -210,6 +211,7 @@ static void iwl_mvm_te_handle_notif(struct iwl_mvm *mvm,
 
                if (te_data->vif->type == NL80211_IFTYPE_P2P_DEVICE) {
                        set_bit(IWL_MVM_STATUS_ROC_RUNNING, &mvm->status);
+                       iwl_mvm_ref(mvm, IWL_MVM_REF_ROC);
                        ieee80211_ready_on_channel(mvm->hw);
                }
        } else {