From: Ben Greear <greearb@xxxxxxxxxxxxxxx>
If one is UN-SET, use the other. Seems this would
be more correct that what we have now.
Signed-off-by: Ben Greear <greearb@xxxxxxxxxxxxxxx>
---
Someone that understands this code better than I
do should review this well before it is considered
for upstream. I'm not sure it is actually needed.
net/wireless/reg.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 785e516..b87035f 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -727,8 +727,15 @@ 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)
+ if (dfs_region1 != dfs_region2) {
+ pr_info("intersect-dfs-region, region1: %d region2: %d\n",
+ dfs_region1, dfs_region2);
+ if (dfs_region1 == NL80211_DFS_UNSET)
+ return dfs_region2;
+ if (dfs_region2 == NL80211_DFS_UNSET)
+ return dfs_region1;
return NL80211_DFS_UNSET;
+ }
return dfs_region1;
}
--
1.7.11.7
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
