mac80211: Update to version 5.15.58-1

[openwrt/openwrt.git] / package / kernel / mac80211 / patches / subsys / 318-cfg80211-allow-continuous-radar-monitoring-on-offcha.patch

diff --git a/package/kernel/mac80211/patches/subsys/318-cfg80211-allow-continuous-radar-monitoring-on-offcha.patch b/package/kernel/mac80211/patches/subsys/318-cfg80211-allow-continuous-radar-monitoring-on-offcha.patch
index 567743d84df8514814da29e14fae6ce7bf3c1308..a1b6e3c80d6b0f45b5525bd7de0692f60a35c313 100644 (file)
--- a/package/kernel/mac80211/patches/subsys/318-cfg80211-allow-continuous-radar-monitoring-on-offcha.patch
+++ b/package/kernel/mac80211/patches/subsys/318-cfg80211-allow-continuous-radar-monitoring-on-offcha.patch
@@ -118,7 +118,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
                                     NL80211_RADAR_CAC_ABORTED);
 --- a/net/wireless/nl80211.c
 +++ b/net/wireless/nl80211.c
-@@ -9263,42 +9263,60 @@ static int nl80211_start_radar_detection
+@@ -9278,42 +9278,60 @@ static int nl80211_start_radar_detection
        struct cfg80211_chan_def chandef;
        enum nl80211_dfs_regions dfs_region;
        unsigned int cac_time_ms;
@@ -198,7 +198,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
  
        cac_time_ms = cfg80211_chandef_dfs_cac_time(&rdev->wiphy, &chandef);
        if (WARN_ON(!cac_time_ms))
-@@ -9311,6 +9329,9 @@ static int nl80211_start_radar_detection
+@@ -9326,6 +9344,9 @@ static int nl80211_start_radar_detection
                wdev->cac_start_time = jiffies;
                wdev->cac_time_ms = cac_time_ms;
        }
@@ -208,7 +208,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
        return err;
  }
  
-@@ -15941,7 +15962,8 @@ static const struct genl_small_ops nl802
+@@ -15961,7 +15982,8 @@ static const struct genl_small_ops nl802
                .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
                .doit = nl80211_start_radar_detection,
                .flags = GENL_UNS_ADMIN_PERM,