evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

iwlwifi: mvm: simplify iwl_mvm_stop_roc()

Browse source 
As pointed out by smatch, there's no need for a loop that always
immediately terminates. Use an if statement instead and while at
it clean up the mvmvif initialization.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
This commit is contained in:
Johannes Berg 2015-06-01 23:38:23 +02:00 • committed by Emmanuel Grumbach
parent aa42fb2420
commit ebf17ff9bb
1 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
drivers/net/wireless/iwlwifi/mvm/time-event.c
View file

@ -797,13 +797,12 @@ int iwl_mvm_start_p2p_roc(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
void iwl_mvm_stop_roc(struct iwl_mvm *mvm) void iwl_mvm_stop_roc(struct iwl_mvm *mvm)
{ {
struct iwl_mvm_vif *mvmvif; struct iwl_mvm_vif *mvmvif = NULL;
struct iwl_mvm_time_event_data *te_data; struct iwl_mvm_time_event_data *te_data;
bool is_p2p = false; bool is_p2p = false;
lockdep_assert_held(&mvm->mutex); lockdep_assert_held(&mvm->mutex);
mvmvif = NULL;
spin_lock_bh(&mvm->time_event_lock); spin_lock_bh(&mvm->time_event_lock);
/* /*
@ -821,17 +820,14 @@ void iwl_mvm_stop_roc(struct iwl_mvm *mvm)
} }
} }
/* /* There can only be at most one AUX ROC time event, we just use the
* Iterate over the list of aux roc time events and find the time * list to simplify/unify code. Remove it if it exists.
* event that is associated with a BSS interface.
* This assumes that a BSS interface can have only a single time
* event at any given time and this time event corresponds to a ROC
* request
*/ */
list_for_each_entry(te_data, &mvm->aux_roc_te_list, list) { te_data = list_first_entry_or_null(&mvm->aux_roc_te_list,
struct iwl_mvm_time_event_data,
list);
if (te_data)
mvmvif = iwl_mvm_vif_from_mac80211(te_data->vif); mvmvif = iwl_mvm_vif_from_mac80211(te_data->vif);
goto remove_te;
}
remove_te: remove_te:
spin_unlock_bh(&mvm->time_event_lock); spin_unlock_bh(&mvm->time_event_lock);