diff options
| author | Sergey Matyukevich <sergey.matyukevich.os@quantenna.com> | 2017-07-28 02:06:51 +0300 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2017-08-03 12:58:13 +0300 |
| commit | c7ead2abd26ab536a2e479af605a6d9529e3a694 (patch) | |
| tree | 7e0c48ad2b66c2a6425236ad52860c7669ac8e51 /drivers/net/wireless/quantenna/qtnfmac/event.c | |
| parent | 97883695d596e296bf327b65e1a4db32fa302d16 (diff) | |
| download | linux-stable-c7ead2abd26ab536a2e479af605a6d9529e3a694.tar.gz linux-stable-c7ead2abd26ab536a2e479af605a6d9529e3a694.tar.bz2 linux-stable-c7ead2abd26ab536a2e479af605a6d9529e3a694.zip | |
qtnfmac: implement scan timeout
Userspace tools may hang on scan in the case when scan completion event
is not returned by firmware. This patch implements the scan timeout
to avoid such situation.
Signed-off-by: Igor Mitsyanko <igor.mitsyanko.os@quantenna.com>
Signed-off-by: Sergey Matyukevich <sergey.matyukevich.os@quantenna.com>
Signed-off-by: Avinash Patil <avinashp@quantenna.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'drivers/net/wireless/quantenna/qtnfmac/event.c')
| -rw-r--r-- | drivers/net/wireless/quantenna/qtnfmac/event.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/quantenna/qtnfmac/event.c b/drivers/net/wireless/quantenna/qtnfmac/event.c index 43d2e7fd6e02..0fc2814eafad 100644 --- a/drivers/net/wireless/quantenna/qtnfmac/event.c +++ b/drivers/net/wireless/quantenna/qtnfmac/event.c @@ -345,6 +345,8 @@ qtnf_event_handle_scan_complete(struct qtnf_wmac *mac, return -EINVAL; } + if (timer_pending(&mac->scan_timeout)) + del_timer_sync(&mac->scan_timeout); qtnf_scan_done(mac, le32_to_cpu(status->flags) & QLINK_SCAN_ABORTED); return 0; |