aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/mvm/mac80211.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/mac80211.c')
-rw-r--r--drivers/net/wireless/iwlwifi/mvm/mac80211.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
index beaf8140abbf..7492fc0f2766 100644
--- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
@@ -1746,14 +1746,16 @@ out:
1746 return ret; 1746 return ret;
1747} 1747}
1748 1748
1749static void iwl_mvm_mac_sched_scan_stop(struct ieee80211_hw *hw, 1749static int iwl_mvm_mac_sched_scan_stop(struct ieee80211_hw *hw,
1750 struct ieee80211_vif *vif) 1750 struct ieee80211_vif *vif)
1751{ 1751{
1752 struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw); 1752 struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);
1753 1753
1754 mutex_lock(&mvm->mutex); 1754 mutex_lock(&mvm->mutex);
1755 iwl_mvm_sched_scan_stop(mvm); 1755 iwl_mvm_sched_scan_stop(mvm);
1756 mutex_unlock(&mvm->mutex); 1756 mutex_unlock(&mvm->mutex);
1757
1758 return 0;
1757} 1759}
1758 1760
1759static int iwl_mvm_mac_set_key(struct ieee80211_hw *hw, 1761static int iwl_mvm_mac_set_key(struct ieee80211_hw *hw,