diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-02-24 15:03:32 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-02-24 15:03:32 -0500 |
| commit | c77986c78aa941af8266272841567e78b72d54cc (patch) | |
| tree | cb30e1bd7d5799bfce5a3837bcfddee059a81733 /drivers/net/wireless/iwlwifi/mvm/mac80211.c | |
| parent | 9e4b4269ecee426f1647425a24186dd1566db554 (diff) | |
| parent | 6658ab80fd4ef940fc2366ddb66690a15ea69c18 (diff) | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/mac80211.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/mac80211.c | 6 |
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 | ||
| 1749 | static void iwl_mvm_mac_sched_scan_stop(struct ieee80211_hw *hw, | 1749 | static 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 | ||
| 1759 | static int iwl_mvm_mac_set_key(struct ieee80211_hw *hw, | 1761 | static int iwl_mvm_mac_set_key(struct ieee80211_hw *hw, |