mac80211: update to linux 6.1-rc8

[openwrt/openwrt.git] / package / kernel / mac80211 / patches / subsys / 210-ap_scan.patch

diff --git a/package/kernel/mac80211/patches/subsys/210-ap_scan.patch b/package/kernel/mac80211/patches/subsys/210-ap_scan.patch
index 9b8e084232c555fd09e4f06b5f57b89510f89df9..bfbb28c55ccefe1f48be55220d3d1fc9e855e8da 100644 (file)
--- a/package/kernel/mac80211/patches/subsys/210-ap_scan.patch
+++ b/package/kernel/mac80211/patches/subsys/210-ap_scan.patch
@@ -8,12 +8,12 @@ Subject: [PATCH] mac80211: allow scans in access point mode (for site survey)
 
 --- a/net/mac80211/cfg.c
 +++ b/net/mac80211/cfg.c
-@@ -2497,7 +2497,7 @@ static int ieee80211_scan(struct wiphy *
-                * the  frames sent while scanning on other channel will be
-                * lost)
+@@ -2720,6 +2720,8 @@ static int ieee80211_scan(struct wiphy *
                 */
--              if (sdata->u.ap.beacon &&
-+              if (0 && sdata->u.ap.beacon &&
-                   (!(wiphy->features & NL80211_FEATURE_AP_SCAN) ||
-                    !(req->flags & NL80211_SCAN_FLAG_AP)))
-                       return -EOPNOTSUPP;
+               fallthrough;
+       case NL80211_IFTYPE_AP:
++              /* skip check */
++              break;
+               /*
+                * If the scan has been forced (and the driver supports
+                * forcing), don't care about being beaconing already.