diff --git a/net/wireless/chan.c b/net/wireless/chan.c
index 0f4043565dca35f3285c94a457e0f5cda18539c8..ffd8ce75c2673cba3a11661c3b9d98e4408eb5b0 100644
--- a/net/wireless/chan.c
+++ b/net/wireless/chan.c
@@ -251,7 +251,7 @@ static void cfg80211_set_chans_dfs_state(struct wiphy *wiphy, u32 center_freq,
 		if (!c || !(c->flags & IEEE80211_CHAN_RADAR))
 			continue;
 
-		printk(KERN_DEBUG "Setting the DFS state of channel %hu to 0x%02x\n",
+		pr_debug("Setting the DFS state of channel %hu to 0x%02x\n",
 		       c->hw_value, dfs_state);
 		c->dfs_state = dfs_state;
 		c->dfs_state_entered = jiffies;
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index a4d28e7ee71d8c549465f5e1c02eb77cc126addf..eb3250b085a93b8bec85d3627dae413cec6a1737 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -7230,49 +7230,49 @@ static int nl80211_start_radar_detection(struct sk_buff *skb,
 	unsigned int cac_time_ms;
 	int err;
 
-	printk(KERN_INFO "Starting radar detection\n");
+	pr_debug("Starting radar detection\n");
 
 	dfs_region = reg_get_dfs_region(wdev->wiphy);
 	if (dfs_region == NL80211_DFS_UNSET) {
-		printk(KERN_ERR "DFS master region not specified\n");
+		pr_debug("DFS master region not specified\n");
 		return -EINVAL;
 	}
 
 	err = nl80211_parse_chandef(rdev, info, &chandef);
 	if (err) {
-		printk(KERN_ERR "Could not parse the channel definition\n");
+		pr_debug("Could not parse the channel definition\n");
 		return err;
 	}
 
 	if (netif_carrier_ok(dev)) {
-		printk(KERN_ERR "Carrier isn't present on device\n");
+		pr_debug("Carrier isn't present on device\n");
 		return -EBUSY;
 	}
 
 	if (wdev->cac_started) {
-		printk(KERN_ERR "CAC already started\n");
+		pr_debug("CAC already started\n");
 		return -EBUSY;
 	}
 
 	err = cfg80211_chandef_dfs_required(wdev->wiphy, &chandef,
 					    wdev->iftype);
 	if (err < 0) {
-		printk(KERN_ERR "Error looking for DFS-required channels\n");
+		pr_debug("Error looking for DFS-required channels\n");
 		return err;
 	}
 
 	if (err == 0) {
-		printk(KERN_ERR "No DFS-required channels found\n");
+		pr_debug("No DFS-required channels found\n");
 		return -EINVAL;
 	}
 
 	if (!cfg80211_chandef_dfs_usable(wdev->wiphy, &chandef)) {
-		printk(KERN_ERR "Channels are not all in DFS_USABLE state\n");
+		pr_debug("Channels are not all in DFS_USABLE state\n");
 		return -EINVAL;
 	}
 
 	if (!rdev->ops->start_radar_detection) {
-		printk(KERN_ERR "Device does not support radar detection\n");
+		pr_debug("Device does not support radar detection\n");
 		return -EOPNOTSUPP;
 	}
 
@@ -7287,7 +7287,7 @@ static int nl80211_start_radar_detection(struct sk_buff *skb,
 		wdev->cac_start_time = jiffies;
 		wdev->cac_time_ms = cac_time_ms;
 	} else {
-		printk(KERN_ERR "Start radar detection in device failed\n");
+		pr_debug("Start radar detection in device failed\n");
 	}
 
 	return err;
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index acd45975f153c5bd8380ede67b1fdc115b060146..37c344986a41f8e5c1c890bab22e9f07eb5835bd 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -109,7 +109,6 @@ static struct platform_device *reg_pdev;
  * (protected by RTNL, can be read under RCU)
  */
 const struct ieee80211_regdomain __rcu *cfg80211_regdomain;
-EXPORT_SYMBOL(cfg80211_regdomain);
 
 /*
  * Number of devices that registered to the core
@@ -131,15 +130,17 @@ static u32 reg_is_indoor_portid;
 
 static void restore_regulatory_settings(bool reset_user);
 
-static const struct ieee80211_regdomain *get_cfg80211_regdom(void)
+const struct ieee80211_regdomain *get_cfg80211_regdom(void)
 {
 	return rtnl_dereference(cfg80211_regdomain);
 }
+EXPORT_SYMBOL(get_cfg80211_regdom);
 
 const struct ieee80211_regdomain *get_wiphy_regdom(struct wiphy *wiphy)
 {
 	return rtnl_dereference(wiphy->regd);
 }
+EXPORT_SYMBOL(get_wiphy_regdom);
 
 static const char *reg_dfs_region_str(enum nl80211_dfs_regions dfs_region)
 {
diff --git a/net/wireless/util.c b/net/wireless/util.c
index ea5724f2b52820932677d42088f03c48303b0dca..6fd41c9d05e845719cf860e16938f8f12dc4cf72 100644
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@ -1638,14 +1638,14 @@ int cfg80211_iter_combinations(struct wiphy *wiphy,
 		}
 
 		if (radar_detect != (c->radar_detect_widths & radar_detect)) {
-			printk(KERN_DEBUG "combination %u, radar detect_widths 0x%02x",
+			pr_debug("combination %u, radar detect_widths 0x%02x",
 			       i, c->radar_detect_widths);
 			goto cont;
 		}
 
 		if (radar_detect && c->radar_detect_regions &&
 		    !(c->radar_detect_regions & BIT(region))) {
-			printk(KERN_DEBUG "radar_detect_regions 0x%x, region %d)",
+			pr_debug("radar_detect_regions 0x%x, region %d)",
 			       c->radar_detect_regions, region);
 			goto cont;
 		}
@@ -1656,7 +1656,7 @@ int cfg80211_iter_combinations(struct wiphy *wiphy,
 		 * to continue to the next.
 		 */
 		if ((all_iftypes & used_iftypes) != used_iftypes) {
-			printk(KERN_DEBUG "all_iftypes 0x%02x, used_iftypes 0x%02x",
+			pr_debug("all_iftypes 0x%02x, used_iftypes 0x%02x",
 			       all_iftypes, used_iftypes);
 			goto cont;
 		}
@@ -1695,7 +1695,7 @@ int cfg80211_check_combinations(struct wiphy *wiphy,
 	if (err)
 		return err;
 	if (num == 0) {
-		printk(KERN_ERR "No suitable interface combination found\n");
+		pr_debug("No suitable interface combination found\n");
 		return -EBUSY;
 	}