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

Merge "Revert "mac80211: Add support for beacon report radio measurement""

Browse source
This commit is contained in:
Linux Build Service Account 2017-01-30 07:04:53 -08:00 • committed by Gerrit - the friendly Code Review server
commit b248e5eaea
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/net/wireless/ath/ath10k/mac.c
View file

@ -3899,16 +3899,12 @@ void __ath10k_scan_finish(struct ath10k *ar)
break; break;
case ATH10K_SCAN_RUNNING: case ATH10K_SCAN_RUNNING:
case ATH10K_SCAN_ABORTING: case ATH10K_SCAN_ABORTING:
if (!ar->scan.is_roc) { if (!ar->scan.is_roc)
struct cfg80211_scan_info info = { ieee80211_scan_completed(ar->hw,
.aborted = (ar->scan.state == (ar->scan.state ==
ATH10K_SCAN_ABORTING), ATH10K_SCAN_ABORTING));
}; else if (ar->scan.roc_notify)
ieee80211_scan_completed(ar->hw, &info);
} else if (ar->scan.roc_notify) {
ieee80211_remain_on_channel_expired(ar->hw); ieee80211_remain_on_channel_expired(ar->hw);
}
/* fall through */ /* fall through */
case ATH10K_SCAN_STARTING: case ATH10K_SCAN_STARTING:
ar->scan.state = ATH10K_SCAN_IDLE; ar->scan.state = ATH10K_SCAN_IDLE;