cfg80211: introduce sync regdom set API for self-managed

A self-managed device will sometimes need to set its regdomain synchronously.
Notably it should be set before usermode has a chance to query it. Expose
a new API to accomplish this which requires the RTNL.

Signed-off-by: Arik Nemtsov <arikx.nemtsov@intel.com>
Reviewed-by: Ilan Peer <ilan.peer@intel.com>
Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

1 files changed, 29 insertions, 2 deletions

diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 8d232b904210..f8ed79729eb0 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -2897,8 +2897,8 @@ int set_regdom(const struct ieee80211_regdomain *rd)
         return 0;
 }
 
-int regulatory_set_wiphy_regd(struct wiphy *wiphy,
-                              struct ieee80211_regdomain *rd)
+static int __regulatory_set_wiphy_regd(struct wiphy *wiphy,
+                                       struct ieee80211_regdomain *rd)
 {
         const struct ieee80211_regdomain *regd;
         const struct ieee80211_regdomain *prev_regd;
@@ -2928,12 +2928,39 @@ int regulatory_set_wiphy_regd(struct wiphy *wiphy,
         spin_unlock(&reg_requests_lock);
 
         kfree(prev_regd);
+        return 0;
+}
+
+int regulatory_set_wiphy_regd(struct wiphy *wiphy,
+                              struct ieee80211_regdomain *rd)
+{
+        int ret = __regulatory_set_wiphy_regd(wiphy, rd);
+
+        if (ret)
+                return ret;
 
         schedule_work(&reg_work);
         return 0;
 }
 EXPORT_SYMBOL(regulatory_set_wiphy_regd);
 
+int regulatory_set_wiphy_regd_sync_rtnl(struct wiphy *wiphy,
+                                        struct ieee80211_regdomain *rd)
+{
+        int ret;
+
+        ASSERT_RTNL();
+
+        ret = __regulatory_set_wiphy_regd(wiphy, rd);
+        if (ret)
+                return ret;
+
+        /* process the request immediately */
+        reg_process_self_managed_hints();
+        return 0;
+}
+EXPORT_SYMBOL(regulatory_set_wiphy_regd_sync_rtnl);
+
 void wiphy_regulatory_register(struct wiphy *wiphy)
 {
         struct regulatory_request *lr;