Commit adbfb058 authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by Johannes Berg
Browse files

cfg80211: intersection dfs regions when intersecting regdomains 



Only allow DFS to be set if the DFS regions agree.

Signed-off-by: default avatarLuis R. Rodriguez <mcgrof@do-not-panic.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 4c7d3982

net/wireless/reg.c

+16 −0
Original line number Original line Diff line number Diff line
@@ -570,6 +570,20 @@ static bool freq_in_rule_band(const struct ieee80211_freq_range *freq_range, 
#undef ONE_GHZ_IN_KHZ

#undef ONE_GHZ_IN_KHZ

}

}





/*

 * 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

 * Helper for regdom_intersect(), this does the real

 * mathematical intersection fun

 * mathematical intersection fun
@@ -701,6 +715,8 @@ regdom_intersect(const struct ieee80211_regdomain *rd1, 
	rd->n_reg_rules = num_rules;

	rd->n_reg_rules = num_rules;

	rd->alpha2[0] = '9';

	rd->alpha2[0] = '9';

	rd->alpha2[1] = '8';

	rd->alpha2[1] = '8';

	rd->dfs_region = reg_intersect_dfs_region(rd1->dfs_region,

						  rd2->dfs_region);





	return rd;

	return rd;

}

}