Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

1 files changed, 6 insertions, 0 deletions

diff --git a/net/wireless/mesh.c b/net/wireless/mesh.c
index d42a3fcb2f67..5af5cc6b2c4c 100644
--- a/net/wireless/mesh.c
+++ b/net/wireless/mesh.c
@@ -236,6 +236,12 @@ int cfg80211_set_mesh_channel(struct cfg80211_registered_device *rdev,
                 if (!netif_running(wdev->netdev))
                         return -ENETDOWN;
 
+                /* cfg80211_can_use_chan() calls
+                 * cfg80211_can_use_iftype_chan() with no radar
+                 * detection, so if we're trying to use a radar
+                 * channel here, something is wrong.
+                 */
+                WARN_ON_ONCE(chandef->chan->flags & IEEE80211_CHAN_RADAR);
                 err = cfg80211_can_use_chan(rdev, wdev, chandef->chan,
                                             CHAN_MODE_SHARED);
                 if (err)