diff options
| author | Eliad Peller | 2015-04-19 10:41:04 +0200 |
|---|---|---|
| committer | Emmanuel Grumbach | 2015-05-26 18:21:07 +0200 |
| commit | c779273b37bec14c33feeab11c4d457a24bc64e0 (patch) | |
| tree | 016291fb1fdeff9d89742d967e7b103059fc4688 /drivers/net/wireless/iwlwifi/mvm/mvm.h | |
| parent | iwlwifi: pcie: don't call set_pwr functions for family 8000 (diff) | |
| download | kernel-qcow2-linux-c779273b37bec14c33feeab11c4d457a24bc64e0.tar.gz kernel-qcow2-linux-c779273b37bec14c33feeab11c4d457a24bc64e0.tar.xz kernel-qcow2-linux-c779273b37bec14c33feeab11c4d457a24bc64e0.zip | |
iwlwifi: mvm: fix ROC reference accounting
commit b112889c5af8124 ("iwlwifi: mvm: add Aux ROC request/response flow")
added aux ROC flow in addition to the existing ROC flow. While doing
it, it moved the ROC reference release to a common work item, which
is being called for both the ROC and aux ROC flows.
This resulted in invalid reference accounting, as no reference was
taken in case of aux ROC, while a reference was released on completion.
Fix it by adding a reference for the aux ROC as well, and release
only the relevant references on completion (according to the set bits).
While at it, convert cancel_work_sync() to flush_work(), in order
to make sure the references are being cleaned properly.
Fixes: b112889c5af8 ("iwlwifi: mvm: add Aux ROC request/response flow")
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>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/mvm.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/mvm.h | 1 |
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 6d332348dca6..dde83efd1a6c 100644 --- a/drivers/net/wireless/iwlwifi/mvm/mvm.h +++ b/drivers/net/wireless/iwlwifi/mvm/mvm.h @@ -276,6 +276,7 @@ enum iwl_mvm_ref_type { IWL_MVM_REF_UCODE_DOWN, IWL_MVM_REF_SCAN, IWL_MVM_REF_ROC, + IWL_MVM_REF_ROC_AUX, IWL_MVM_REF_P2P_CLIENT, IWL_MVM_REF_AP_IBSS, IWL_MVM_REF_USER, |