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.h | |
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.h')
-rw-r--r-- | drivers/net/wireless/quantenna/qtnfmac/cfg80211.h | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/drivers/net/wireless/quantenna/qtnfmac/cfg80211.h b/drivers/net/wireless/quantenna/qtnfmac/cfg80211.h index 66db26613b1f..b73425122a10 100644 --- a/drivers/net/wireless/quantenna/qtnfmac/cfg80211.h +++ b/drivers/net/wireless/quantenna/qtnfmac/cfg80211.h @@ -28,23 +28,4 @@ void qtnf_band_init_rates(struct ieee80211_supported_band *band); void qtnf_band_setup_htvht_caps(struct qtnf_mac_info *macinfo, struct ieee80211_supported_band *band); -static inline void qtnf_scan_done(struct qtnf_wmac *mac, bool aborted) -{ - struct cfg80211_scan_info info = { - .aborted = aborted, - }; - - if (timer_pending(&mac->scan_timeout)) - del_timer_sync(&mac->scan_timeout); - - mutex_lock(&mac->mac_lock); - - if (mac->scan_req) { - cfg80211_scan_done(mac->scan_req, &info); - mac->scan_req = NULL; - } - - mutex_unlock(&mac->mac_lock); -} - #endif /* _QTN_FMAC_CFG80211_H_ */ |