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

1 files changed, 3 insertions, 4 deletions

diff --git a/net/wireless/ibss.c b/net/wireless/ibss.c
index 1470b90e438f..349db9ddc0d1 100644
--- a/net/wireless/ibss.c
+++ b/net/wireless/ibss.c
@@ -128,12 +128,11 @@ int __cfg80211_join_ibss(struct cfg80211_registered_device *rdev,
 #endif
         check_chan = params->chandef.chan;
         if (params->userspace_handles_dfs) {
-                /* use channel NULL to check for radar even if the current
-                 * channel is not a radar channel - it might decide to change
-                 * to DFS channel later.
+                /* Check for radar even if the current channel is not
+                 * a radar channel - it might decide to change to DFS
+                 * channel later.
                  */
                 radar_detect_width = BIT(params->chandef.width);
-                check_chan = NULL;
         }
 
         err = cfg80211_can_use_iftype_chan(rdev, wdev, wdev->iftype,