@@ -171,6 +171,7 @@ enum nl80211_dfs_regions reg_get_dfs_region(struct wiphy *wiphy)
{
const struct ieee80211_regdomain *regd = NULL;
const struct ieee80211_regdomain *wiphy_regd = NULL;
+ enum nl80211_dfs_regions dfs_region;
rcu_read_lock();
regd = get_cfg80211_regdom();
@@ -182,6 +183,13 @@ enum nl80211_dfs_regions reg_get_dfs_region(struct wiphy *wiphy)
if (!wiphy_regd)
goto out;
+ /* In case the wiphy is self managed, return its dfs domain */
+ if (wiphy->regulatory_flags & REGULATORY_WIPHY_SELF_MANAGED) {
+ dfs_region = wiphy_regd->dfs_region;
+ rcu_read_unlock();
+ return dfs_region;
+ }
+
if (wiphy_regd->dfs_region == regd->dfs_region)
goto out;
Currently during CAC start or other radar events, the DFS domain is fetched from cfg based on global DFS setting. But this could be different in case of self managed wiphy's in case the self managed driver updates its database or supports regions which has DFS domain set to UNSET in cfg80211 local regdomain. This avoids AP bringup failure for these self-managed drivers when such conflict occurs. Signed-off-by: Sriram R <srirrama@codeaurora.org> --- net/wireless/reg.c | 8 ++++++++ 1 file changed, 8 insertions(+)