From 62518f18d1de0903533ddfe4e28d3a24a886a5ae Mon Sep 17 00:00:00 2001 From: Rajeev Kumar Sirasanagandla Date: Wed, 25 Jan 2017 20:32:21 +0530 Subject: [PATCH] Revert "mac80211: Add support for beacon report radio measurement" This reverts commit 8e5ea69a4159 ("mac80211: Add support for beacon report radio measurement") which is incomplete cherry-pick of commit 7947d3e075cd ("mac80211: Add support for beacon report radio measurement") from git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git and due to which compilation of ath10k module is broken. Incomplete cherry-pick means not all files of corresponding commit from opensource repo are pulled. CRs-Fixed: 1115991 Change-Id: Iec6aeea39e1a581c91641329fcfa85e608d60bfa Signed-off-by: Rajeev Kumar Sirasanagandla --- drivers/net/wireless/ath/ath10k/mac.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c index 76297d69f1ed..7a44b723b4e0 100644 --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c @@ -3899,16 +3899,12 @@ void __ath10k_scan_finish(struct ath10k *ar) break; case ATH10K_SCAN_RUNNING: case ATH10K_SCAN_ABORTING: - if (!ar->scan.is_roc) { - struct cfg80211_scan_info info = { - .aborted = (ar->scan.state == - ATH10K_SCAN_ABORTING), - }; - - ieee80211_scan_completed(ar->hw, &info); - } else if (ar->scan.roc_notify) { + if (!ar->scan.is_roc) + ieee80211_scan_completed(ar->hw, + (ar->scan.state == + ATH10K_SCAN_ABORTING)); + else if (ar->scan.roc_notify) ieee80211_remain_on_channel_expired(ar->hw); - } /* fall through */ case ATH10K_SCAN_STARTING: ar->scan.state = ATH10K_SCAN_IDLE;