1 files changed, 2 insertions, 1 deletions

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index e677b751d468..520efa8a0791 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -1167,7 +1167,8 @@ static int ieee80211_scan(struct wiphy *wiphy,
 
         if (sdata->vif.type != NL80211_IFTYPE_STATION &&
             sdata->vif.type != NL80211_IFTYPE_ADHOC &&
-            sdata->vif.type != NL80211_IFTYPE_MESH_POINT)
+            sdata->vif.type != NL80211_IFTYPE_MESH_POINT &&
+            (sdata->vif.type != NL80211_IFTYPE_AP || sdata->u.ap.beacon))
                 return -EOPNOTSUPP;
 
         return ieee80211_request_scan(sdata, req);