1 files changed, 4 insertions, 2 deletions

diff --git a/net/mac80211/ieee80211_ioctl.c b/net/mac80211/ieee80211_ioctl.c
index bbd9bc572a54..dc03bd796fee 100644
--- a/net/mac80211/ieee80211_ioctl.c
+++ b/net/mac80211/ieee80211_ioctl.c
@@ -315,7 +315,7 @@ int ieee80211_set_channel(struct ieee80211_local *local, int channel, int freq)
         }
 
         if (set) {
-                if (local->sta_scanning)
+                if (local->sta_sw_scanning)
                         ret = 0;
                 else
                         ret = ieee80211_hw_config(local);
@@ -545,8 +545,10 @@ static int ieee80211_ioctl_giwscan(struct net_device *dev,
 {
         int res;
         struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
-        if (local->sta_scanning)
+
+        if (local->sta_sw_scanning || local->sta_hw_scanning)
                 return -EAGAIN;
+
         res = ieee80211_sta_scan_results(dev, extra, data->length);
         if (res >= 0) {
                 data->length = res;