Merge tag 'mac80211-next-for-davem-2015-10-05' of git://git.kernel.org/pub/scm/linux...

[firefly-linux-kernel-4.4.55.git] / net / mac80211 / iface.c

diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index 6964fc6a8ea2c7b46149e8be5e79c6f373f50d40..42d7f0f65bd65e1210d43403bc3ae147f8ad6787 100644 (file)
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -1204,7 +1204,7 @@ static void ieee80211_iface_work(struct work_struct *work)
        if (!ieee80211_sdata_running(sdata))
                return;
 
-       if (local->scanning)
+       if (test_bit(SCAN_SW_SCANNING, &local->scanning))
                return;
 
        if (!ieee80211_can_run_worker(local))