Merge tag 'mac80211-next-for-net-next-2020-02-14' of git://git.kernel.org/pub/scm...

[tomoyo/tomoyo-test1.git] / net / wireless / reg.c

diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index ea7bc56..173a7d7 100644 (file)
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -2263,14 +2263,15 @@ static void update_all_wiphy_regulatory(enum nl80211_reg_initiator initiator)
 
 static void handle_channel_custom(struct wiphy *wiphy,
                                  struct ieee80211_channel *chan,
-                                 const struct ieee80211_regdomain *regd)
+                                 const struct ieee80211_regdomain *regd,
+                                 u32 min_bw)
 {
        u32 bw_flags = 0;
        const struct ieee80211_reg_rule *reg_rule = NULL;
        const struct ieee80211_power_rule *power_rule = NULL;
        u32 bw;
 
-       for (bw = MHZ_TO_KHZ(20); bw >= MHZ_TO_KHZ(5); bw = bw / 2) {
+       for (bw = MHZ_TO_KHZ(20); bw >= min_bw; bw = bw / 2) {
                reg_rule = freq_reg_info_regd(MHZ_TO_KHZ(chan->center_freq),
                                              regd, bw);
                if (!IS_ERR(reg_rule))
@@ -2326,8 +2327,14 @@ static void handle_band_custom(struct wiphy *wiphy,
        if (!sband)
                return;
 
+       /*
+        * We currently assume that you always want at least 20 MHz,
+        * otherwise channel 12 might get enabled if this rule is
+        * compatible to US, which permits 2402 - 2472 MHz.
+        */
        for (i = 0; i < sband->n_channels; i++)
-               handle_channel_custom(wiphy, &sband->channels[i], regd);
+               handle_channel_custom(wiphy, &sband->channels[i], regd,
+                                     MHZ_TO_KHZ(20));
 }
 
 /* Used by drivers prior to wiphy registration */
@@ -3887,6 +3894,25 @@ bool regulatory_pre_cac_allowed(struct wiphy *wiphy)
 }
 EXPORT_SYMBOL(regulatory_pre_cac_allowed);
 
+static void cfg80211_check_and_end_cac(struct cfg80211_registered_device *rdev)
+{
+       struct wireless_dev *wdev;
+       /* If we finished CAC or received radar, we should end any
+        * CAC running on the same channels.
+        * the check !cfg80211_chandef_dfs_usable contain 2 options:
+        * either all channels are available - those the CAC_FINISHED
+        * event has effected another wdev state, or there is a channel
+        * in unavailable state in wdev chandef - those the RADAR_DETECTED
+        * event has effected another wdev state.
+        * In both cases we should end the CAC on the wdev.
+        */
+       list_for_each_entry(wdev, &rdev->wiphy.wdev_list, list) {
+               if (wdev->cac_started &&
+                   !cfg80211_chandef_dfs_usable(&rdev->wiphy, &wdev->chandef))
+                       rdev_end_cac(rdev, wdev->netdev);
+       }
+}
+
 void regulatory_propagate_dfs_state(struct wiphy *wiphy,
                                    struct cfg80211_chan_def *chandef,
                                    enum nl80211_dfs_state dfs_state,
@@ -3913,8 +3939,10 @@ void regulatory_propagate_dfs_state(struct wiphy *wiphy,
                cfg80211_set_dfs_state(&rdev->wiphy, chandef, dfs_state);
 
                if (event == NL80211_RADAR_DETECTED ||
-                   event == NL80211_RADAR_CAC_FINISHED)
+                   event == NL80211_RADAR_CAC_FINISHED) {
                        cfg80211_sched_dfs_chan_update(rdev);
+                       cfg80211_check_and_end_cac(rdev);
+               }
 
                nl80211_radar_notify(rdev, chandef, event, NULL, GFP_KERNEL);
        }