From: Luis R. Rodriguez Date: Wed, 13 Nov 2013 17:54:03 +0000 (+0100) Subject: cfg80211: intersection dfs regions when intersecting regdomains X-Git-Tag: v3.14-rc1~94^2~3^2^2~238 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=adbfb058155dfabe77ea73c303cbd75af7e4d9d3;p=kernel%2Fkernel-generic.git cfg80211: intersection dfs regions when intersecting regdomains Only allow DFS to be set if the DFS regions agree. Signed-off-by: Luis R. Rodriguez Signed-off-by: Johannes Berg --- diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 2796b62..068cb40 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; }