summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorLuis R. Rodriguez <mcgrof@do-not-panic.com>2013-11-13 18:54:03 +0100
committerJohannes Berg <johannes.berg@intel.com>2013-11-25 20:52:14 +0100
commitadbfb058155dfabe77ea73c303cbd75af7e4d9d3 (patch)
tree05a4504299763851d6e338e9e378e746b5d37a5f /net
parent4c7d3982a6e37831382b9ef90aa0dbadc0bf3a22 (diff)
downloadlinux-adbfb058155dfabe77ea73c303cbd75af7e4d9d3.tar.gz
linux-adbfb058155dfabe77ea73c303cbd75af7e4d9d3.tar.bz2
linux-adbfb058155dfabe77ea73c303cbd75af7e4d9d3.zip
cfg80211: intersection dfs regions when intersecting regdomains
Only allow DFS to be set if the DFS regions agree. Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
-rw-r--r--net/wireless/reg.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 2796b622890f..068cb4055a62 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -571,6 +571,20 @@ static bool freq_in_rule_band(const struct ieee80211_freq_range *freq_range,
}
/*
+ * Later on we can perhaps use the more restrictive DFS
+ * region but we don't have information for that yet so
+ * for now simply disallow conflicts.
+ */
+static enum nl80211_dfs_regions
+reg_intersect_dfs_region(const enum nl80211_dfs_regions dfs_region1,
+ const enum nl80211_dfs_regions dfs_region2)
+{
+ if (dfs_region1 != dfs_region2)
+ return NL80211_DFS_UNSET;
+ return dfs_region1;
+}
+
+/*
* Helper for regdom_intersect(), this does the real
* mathematical intersection fun
*/
@@ -701,6 +715,8 @@ regdom_intersect(const struct ieee80211_regdomain *rd1,
rd->n_reg_rules = num_rules;
rd->alpha2[0] = '9';
rd->alpha2[1] = '8';
+ rd->dfs_region = reg_intersect_dfs_region(rd1->dfs_region,
+ rd2->dfs_region);
return rd;
}