diff options
| author | Eliad Peller <eliad@wizery.com> | 2015-01-07 17:50:09 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2015-01-14 09:37:06 +0100 |
| commit | 5cbc95a749c5f3b238af0953881edede9bfe5bf6 (patch) | |
| tree | 4bd05d244a56723b38bfafcba8eed0875249027e /net/mac80211/cfg.c | |
| parent | 50075892ba30c4c19c41235b5308ee5a1e2125d7 (diff) | |
| download | op-kernel-dev-5cbc95a749c5f3b238af0953881edede9bfe5bf6.zip op-kernel-dev-5cbc95a749c5f3b238af0953881edede9bfe5bf6.tar.gz | |
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>
Diffstat (limited to 'net/mac80211/cfg.c')
| -rw-r--r-- | net/mac80211/cfg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 9ccecb4..fd6860d 100644 --- 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 */ |
