diff options
| author | Igor Mitsyanko <igor.mitsyanko.os@quantenna.com> | 2018-01-22 13:46:32 +0100 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2018-01-24 17:00:54 +0100 |
| commit | f2cddd5469b0e2284fa92f7013f6dc99debb3968 (patch) | |
| tree | bf913219d22615e81228ae31868198548a4dc042 /drivers/net/wireless/quantenna/qtnfmac/cfg80211.c | |
| parent | qtnfmac: fix STA disconnect procedure (diff) | |
| download | linux-f2cddd5469b0e2284fa92f7013f6dc99debb3968.tar.xz linux-f2cddd5469b0e2284fa92f7013f6dc99debb3968.zip | |
qtnfmac: do not use mutexes in timer context
The function qtnf_scan_done makes use of mutexes which is wrong
since it may be called from timer context. Move scan timeout
handler from timer to deferred work.
Signed-off-by: Igor Mitsyanko <igor.mitsyanko.os@quantenna.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'drivers/net/wireless/quantenna/qtnfmac/cfg80211.c')
| -rw-r--r-- | drivers/net/wireless/quantenna/qtnfmac/cfg80211.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c b/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c index edebf23e8eae..0398bece5782 100644 --- a/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c +++ b/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c @@ -595,19 +595,13 @@ qtnf_del_station(struct wiphy *wiphy, struct net_device *dev, return ret; } -static void qtnf_scan_timeout(struct timer_list *t) -{ - struct qtnf_wmac *mac = from_timer(mac, t, scan_timeout); - - pr_warn("mac%d scan timed out\n", mac->macid); - qtnf_scan_done(mac, true); -} - static int qtnf_scan(struct wiphy *wiphy, struct cfg80211_scan_request *request) { struct qtnf_wmac *mac = wiphy_priv(wiphy); + cancel_delayed_work_sync(&mac->scan_timeout); + mac->scan_req = request; if (qtnf_cmd_send_scan(mac)) { @@ -616,9 +610,8 @@ qtnf_scan(struct wiphy *wiphy, struct cfg80211_scan_request *request) return -EFAULT; } - mac->scan_timeout.function = qtnf_scan_timeout; - mod_timer(&mac->scan_timeout, - jiffies + QTNF_SCAN_TIMEOUT_SEC * HZ); + queue_delayed_work(mac->bus->workqueue, &mac->scan_timeout, + QTNF_SCAN_TIMEOUT_SEC * HZ); return 0; } |