linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] cfg80211: reg: set DFS CAC time in case of custom regd
@ 2014-04-09 11:47 Janusz Dziedzic
  2014-04-11  8:00 ` Johannes Berg
  0 siblings, 1 reply; 2+ messages in thread
From: Janusz Dziedzic @ 2014-04-09 11:47 UTC (permalink / raw)
  To: linux-wireless; +Cc: johannes, Janusz Dziedzic

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>
---
 net/wireless/reg.c |    7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index f59aaac..220c4a2 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -1071,6 +1071,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;
 	}
 
-- 
1.7.9.5


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] cfg80211: reg: set DFS CAC time in case of custom regd
  2014-04-09 11:47 [PATCH] cfg80211: reg: set DFS CAC time in case of custom regd Janusz Dziedzic
@ 2014-04-11  8:00 ` Johannes Berg
  0 siblings, 0 replies; 2+ messages in thread
From: Johannes Berg @ 2014-04-11  8:00 UTC (permalink / raw)
  To: Janusz Dziedzic; +Cc: linux-wireless

On Wed, 2014-04-09 at 13:47 +0200, Janusz Dziedzic wrote:
> 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.

Applied.

johannes


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2014-04-11  8:00 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-04-09 11:47 [PATCH] cfg80211: reg: set DFS CAC time in case of custom regd Janusz Dziedzic
2014-04-11  8:00 ` Johannes Berg

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).