Commit 4f267c11 authored Apr 09, 2014 by Janusz Dziedzic Committed by Johannes Berg Apr 11, 2014

cfg80211: reg: set DFS CAC time in case of custom regd



Set DFS CAC time also in case of using custom
and strict regulatory from drivers. In other case
we could have unset DFS CAC time directly after
driver loaded and before issue regulatory set from
user mode.

Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

parent c14a7400

net/wireless/reg.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -1096,6 +1096,13 @@ static void handle_channel(struct wiphy *wiphy,
		(int) MBI_TO_DBI(power_rule->max_antenna_gain);
		chan->max_reg_power = chan->max_power = chan->orig_mpwr =
		(int) MBM_TO_DBM(power_rule->max_eirp);

		if (chan->flags & IEEE80211_CHAN_RADAR) {
		chan->dfs_cac_ms = IEEE80211_DFS_MIN_CAC_TIME_MS;
		if (reg_rule->dfs_cac_ms)
		chan->dfs_cac_ms = reg_rule->dfs_cac_ms;
		}

		return;
		}