From: Jérôme Pouiller Date: Mon, 20 Apr 2020 16:03:07 +0000 (+0200) Subject: staging: wfx: drop protection for asynchronous join during scan X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a2ed058918886b7a749ba884efc231b0977b3159;p=linux.git staging: wfx: drop protection for asynchronous join during scan In former code (before the inclusion of the driver in mainline kernel), hif_join() could run asynchronously. When a join request was in progress, it was forbidden to launch hif_scan(). Now, hif_join() is always run synchronously. There is no more reasons to keep a protection against this case. Signed-off-by: Jérôme Pouiller Link: https://lore.kernel.org/r/20200420160311.57323-13-Jerome.Pouiller@silabs.com Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/wfx/scan.c b/drivers/staging/wfx/scan.c index 276fdacd71437..76761e4960dd7 100644 --- a/drivers/staging/wfx/scan.c +++ b/drivers/staging/wfx/scan.c @@ -110,9 +110,6 @@ int wfx_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif, if (vif->type == NL80211_IFTYPE_AP) return -EOPNOTSUPP; - if (wvif->state == WFX_STATE_PRE_STA) - return -EBUSY; - wvif->scan_req = hw_req; schedule_work(&wvif->scan_work); return 0;