summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/marvell
diff options
context:
space:
mode:
authorGanapathi Bhat <gbhat@marvell.com>2017-08-30 21:38:35 +0200
committerKalle Valo <kvalo@codeaurora.org>2017-09-20 14:45:45 +0200
commit31726ff20190bafcf41d5eb5a7615f052f15bdd3 (patch)
tree151787727b6cfe256759da16a8be96d74ed9aa6a /drivers/net/wireless/marvell
parentrtlwifi: rtl8192ee: Fix memory leak when loading firmware (diff)
downloadlinux-31726ff20190bafcf41d5eb5a7615f052f15bdd3.tar.xz
linux-31726ff20190bafcf41d5eb5a7615f052f15bdd3.zip
mwifiex: notify cfg80211 about scan abort
Driver sends a series of scan commands to firmware to serve a user scan request. If an intermediate scan command fails, driver aborts the scan but it is not being informed to cfg80211. This will cause issues in applications performing periodic scans. Fix this by informing scan abort. Signed-off-by: Cathy Luo <cluo@marvell.com> Signed-off-by: Ganapathi Bhat <gbhat@marvell.com> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'drivers/net/wireless/marvell')
-rw-r--r--drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c b/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c
index 0fba5b10ef2d..1bd4e13b8449 100644
--- a/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c
+++ b/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c
@@ -70,11 +70,7 @@ mwifiex_process_cmdresp_error(struct mwifiex_private *priv,
break;
case HostCmd_CMD_802_11_SCAN:
case HostCmd_CMD_802_11_SCAN_EXT:
- mwifiex_cancel_pending_scan_cmd(adapter);
-
- spin_lock_irqsave(&adapter->mwifiex_cmd_lock, flags);
- adapter->scan_processing = false;
- spin_unlock_irqrestore(&adapter->mwifiex_cmd_lock, flags);
+ mwifiex_cancel_scan(adapter);
break;
case HostCmd_CMD_MAC_CONTROL: