Rewind v3.13-rc3+ (78fd82238d0e5716) to v3.12

1 files changed, 12 insertions, 3 deletions

diff --git a/net/wireless/core.h b/net/wireless/core.h
index af10e59..3159e9c 100644
--- a/net/wireless/core.h
+++ b/net/wireless/core.h
@@ -234,10 +234,10 @@ struct cfg80211_beacon_registration {
 };
 
 /* free object */
-void cfg80211_dev_free(struct cfg80211_registered_device *rdev);
+extern void cfg80211_dev_free(struct cfg80211_registered_device *rdev);
 
-int cfg80211_dev_rename(struct cfg80211_registered_device *rdev,
-			char *newname);
+extern int cfg80211_dev_rename(struct cfg80211_registered_device *rdev,
+			       char *newname);
 
 void ieee80211_set_bitrate_flags(struct wiphy *wiphy);
 
@@ -382,6 +382,15 @@ int cfg80211_can_use_iftype_chan(struct cfg80211_registered_device *rdev,
 				 enum cfg80211_chan_mode chanmode,
 				 u8 radar_detect);
 
+/**
+ * cfg80211_chandef_dfs_required - checks if radar detection is required
+ * @wiphy: the wiphy to validate against
+ * @chandef: the channel definition to check
+ * Return: 1 if radar detection is required, 0 if it is not, < 0 on error
+ */
+int cfg80211_chandef_dfs_required(struct wiphy *wiphy,
+				  const struct cfg80211_chan_def *c);
+
 void cfg80211_set_dfs_state(struct wiphy *wiphy,
 			    const struct cfg80211_chan_def *chandef,
 			    enum nl80211_dfs_state dfs_state);