cfg80211: enable use of non-cleared DFS channels for DFS offload

Currently channel switch/start_ap to DFS channel cannot be done to
non-CAC-cleared channel even if DFS offload if enabled.
Make non-cleared DFS channels available if DFS offload is enabled.
CAC will be started by HW after channel change, start_ap call, etc.

Signed-off-by: Dmitry Lebed <dlebed@quantenna.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/wireless/chan.c b/net/wireless/chan.c
index a48859982a32b14d2109082f5691d3eafded7811..2db713d18f715d5d150cedf95e57ec483928decb 100644 (file)
--- a/net/wireless/chan.c
+++ b/net/wireless/chan.c
@@ -579,6 +579,10 @@ static bool cfg80211_get_chans_dfs_available(struct wiphy *wiphy,
 {
        struct ieee80211_channel *c;
        u32 freq, start_freq, end_freq;
+       bool dfs_offload;
+
+       dfs_offload = wiphy_ext_feature_isset(wiphy,
+                                             NL80211_EXT_FEATURE_DFS_OFFLOAD);
 
        start_freq = cfg80211_get_start_freq(center_freq, bandwidth);
        end_freq = cfg80211_get_end_freq(center_freq, bandwidth);
@@ -596,8 +600,9 @@ static bool cfg80211_get_chans_dfs_available(struct wiphy *wiphy,
                if (c->flags & IEEE80211_CHAN_DISABLED)
                        return false;
 
-               if ((c->flags & IEEE80211_CHAN_RADAR)  &&
-                   (c->dfs_state != NL80211_DFS_AVAILABLE))
+               if ((c->flags & IEEE80211_CHAN_RADAR) &&
+                   (c->dfs_state != NL80211_DFS_AVAILABLE) &&
+                   !(c->dfs_state == NL80211_DFS_USABLE && dfs_offload))
                        return false;
        }