]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
qtnfmac: do not cancel scan in disconnect callback
authorIgor Mitsyanko <igor.mitsyanko.os@quantenna.com>
Fri, 5 Oct 2018 10:11:35 +0000 (10:11 +0000)
committerKalle Valo <kvalo@codeaurora.org>
Fri, 5 Oct 2018 11:01:19 +0000 (14:01 +0300)
Do not cancel scan in disconnect callback. If there is an active scan,
it will be cancelled by firmware, then host driver will be properly
notified by event.

Cancelling scan in disconnect callback occasionally may lead to the
following race issue. Host is able to queue one scan after scan
abort in disconnect callback, and another scan after scan abort
in event handler. As a result, firmware receives second scan
before the first scan completes.

Signed-off-by: Igor Mitsyanko <igor.mitsyanko.os@quantenna.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
drivers/net/wireless/quantenna/qtnfmac/cfg80211.c

index 4631277092bf9c8efaf411571bff8082fb535f9e..8b30d651cbe3b2128989726bf3e07fe992f140b7 100644 (file)
@@ -666,8 +666,6 @@ qtnf_disconnect(struct wiphy *wiphy, struct net_device *dev,
                goto out;
        }
 
-       qtnf_scan_done(mac, true);
-
        ret = qtnf_cmd_send_disconnect(vif, reason_code);
        if (ret)
                pr_err("VIF%u.%u: failed to disconnect\n",