projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
548db54
)
ath10k: abort scan properly if wmi_scan_stop fails
author
Michal Kazior
<michal.kazior@tieto.com>
Fri, 5 Jul 2013 13:15:16 +0000
(16:15 +0300)
committer
Kalle Valo
<kvalo@qca.qualcomm.com>
Tue, 30 Jul 2013 15:01:18 +0000
(18:01 +0300)
Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
drivers/net/wireless/ath/ath10k/mac.c
patch
|
blob
|
history
diff --git
a/drivers/net/wireless/ath/ath10k/mac.c
b/drivers/net/wireless/ath/ath10k/mac.c
index
278c968
..
5082503
100644
(file)
--- a/
drivers/net/wireless/ath/ath10k/mac.c
+++ b/
drivers/net/wireless/ath/ath10k/mac.c
@@
-1590,6
+1590,10
@@
static int ath10k_abort_scan(struct ath10k *ar)
ret = ath10k_wmi_stop_scan(ar, &arg);
if (ret) {
ath10k_warn("could not submit wmi stop scan (%d)\n", ret);
+ spin_lock_bh(&ar->data_lock);
+ ar->scan.in_progress = false;
+ ath10k_offchan_tx_purge(ar);
+ spin_unlock_bh(&ar->data_lock);
return -EIO;
}