mac80211: remove local->radar_detect_enabled

local->radar_detect_enabled should tell whether
radar_detect is enabled on any interface belonging
to local.

However, it's not getting updated correctly
in many cases (actually, when testing with hwsim
it's never been set, even when the dfs master
is beaconing).

Instead of handling all the corner cases
(e.g. channel switch), simply check whether
radar detection is enabled only when needed,
instead of caching the result.

Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 9ccecb405edee16d31b8257c6176ff0f393fe961..fd6860d7f55734c1c98a55763c30394f8faf46b2 100644 (file)
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -2557,7 +2557,7 @@ static int ieee80211_start_roc_work(struct ieee80211_local *local,
 
        /* if there's one pending or we're scanning, queue this one */
        if (!list_empty(&local->roc_list) ||
-           local->scanning || local->radar_detect_enabled)
+           local->scanning || ieee80211_is_radar_required(local))
                goto out_check_combine;
 
        /* if not HW assist, just queue & schedule work */

diff --git a/net/mac80211/chan.c b/net/mac80211/chan.c
index da1c12c34487e31b8d183ab70b856c5f3f4466bb..92c721dbd5af80e6e02de15b3825f87425b31e41 100644 (file)
--- a/net/mac80211/chan.c
+++ b/net/mac80211/chan.c
@@ -388,7 +388,7 @@ ieee80211_find_chanctx(struct ieee80211_local *local,
        return NULL;
 }
 
-static bool ieee80211_is_radar_required(struct ieee80211_local *local)
+bool ieee80211_is_radar_required(struct ieee80211_local *local)
 {
        struct ieee80211_sub_if_data *sdata;
 
@@ -567,7 +567,7 @@ static void ieee80211_recalc_radar_chanctx(struct ieee80211_local *local,
        bool radar_enabled;
 
        lockdep_assert_held(&local->chanctx_mtx);
-       /* for setting local->radar_detect_enabled */
+       /* for ieee80211_is_radar_required */
        lockdep_assert_held(&local->mtx);
 
        radar_enabled = ieee80211_is_radar_required(local);
@@ -576,7 +576,6 @@ static void ieee80211_recalc_radar_chanctx(struct ieee80211_local *local,
                return;
 
        chanctx->conf.radar_enabled = radar_enabled;
-       local->radar_detect_enabled = chanctx->conf.radar_enabled;
 
        if (!local->use_chanctx) {
                local->hw.conf.radar_enabled = chanctx->conf.radar_enabled;

diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 91878ef5069aef733d4d57a5322ab93852963363..156ea79e01579405de37480fdb0797768f675ecf 100644 (file)
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -1168,8 +1168,6 @@ struct ieee80211_local {
        /* wowlan is enabled -- don't reconfig on resume */
        bool wowlan;
 
-       /* DFS/radar detection is enabled */
-       bool radar_detect_enabled;
        struct work_struct radar_detected_work;
 
        /* number of RX chains the hardware has */
@@ -1982,6 +1980,7 @@ void ieee80211_recalc_smps_chanctx(struct ieee80211_local *local,
                                   struct ieee80211_chanctx *chanctx);
 void ieee80211_recalc_chanctx_min_def(struct ieee80211_local *local,
                                      struct ieee80211_chanctx *ctx);
+bool ieee80211_is_radar_required(struct ieee80211_local *local);
 
 void ieee80211_dfs_cac_timer(unsigned long data);
 void ieee80211_dfs_cac_timer_work(struct work_struct *work);

diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c
index 844fb5f7910e1a7b2cd03f1c02a8d11d3bf206a7..b0320bb20ab89d793dc65d07719802a5a5566eed 100644 (file)
--- a/net/mac80211/scan.c
+++ b/net/mac80211/scan.c
@@ -432,7 +432,7 @@ static int ieee80211_start_sw_scan(struct ieee80211_local *local,
 static bool ieee80211_can_scan(struct ieee80211_local *local,
                               struct ieee80211_sub_if_data *sdata)
 {
-       if (local->radar_detect_enabled)
+       if (ieee80211_is_radar_required(local))
                return false;
 
        if (!list_empty(&local->roc_list))