CHROMIUM: iwl7000: chromeOS: lock mutex before calling iwl_mvm_get_current_regdomain()
The iwl_mvm_get_current_regdomain() function needs to be called with
the mutex locked, so add mutex protection before calling it in our
hardcoded wmm ac function in ChromeOS.
BUG=b:121028258
TEST=build, boot and connect on falco_li.
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
iwl7000-tree: f7696c3c8fe4dc75917e4b815dfe3c583c2ee867
(cherry picked from commit 236f7d6e49572b34fa3b966155a569943945a1c6)
Change-Id: I60d256ccc2ce209914b299e3e1ab05ed36670ca5
Reviewed-on: https://chromium-review.googlesource.com/c/1455366
Reviewed-by: David McMahon <djmm@chromium.org>
Commit-Queue: David McMahon <djmm@chromium.org>
Tested-by: David McMahon <djmm@chromium.org>
diff --git a/drivers/net/wireless/iwl7000/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/iwl7000/iwlwifi/mvm/mac80211.c
index a0ec6d3..cffeb67 100644
--- a/drivers/net/wireless/iwl7000/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/iwl7000/iwlwifi/mvm/mac80211.c
@@ -3074,7 +3074,10 @@
vif->type != NL80211_IFTYPE_P2P_GO)
return;
+ mutex_lock(&mvm->mutex);
rd = iwl_mvm_get_current_regdomain(mvm, NULL);
+ mutex_unlock(&mvm->mutex);
+
if (IS_ERR_OR_NULL(rd))
return;
