Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Sender: srirrama=codeaurora.org@mg.codeaurora.org
DMARC-Filter: OpenDMARC Filter v1.4.1 smtp.codeaurora.org C1285C4338F
From:   Sriram R <srirrama@codeaurora.org>
To:     linux-wireless@vger.kernel.org
Cc:     johannes@sipsolutions.net, Sriram R <srirrama@codeaurora.org>
Subject: [PATCH] cfg80211: Fetch wiphy DFS domain if it is self-managed
Date:   Thu, 26 Aug 2021 05:08:50 +0530
Message-Id: <1629934730-16388-1-git-send-email-srirrama@codeaurora.org>
Precedence: bulk

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(+)

diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index c2d0ff7..78626e7 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -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;
 
-- 
2.7.4