commit 2beb6dab2d799ee8934cb0801845e551ad8c70f2
author Luciano Coelho <luciano.coelho@intel.com> Tue Feb 18 11:40:36 2014 +0200
committer Johannes Berg <johannes.berg@intel.com> Wed Apr 09 10:55:41 2014 +0200
tree 58261561098a2bc3aaf747041382324119b00128
parent cb2d956dd329caa11b5ece454dc52253aa038e73

cfg80211/mac80211: refactor cfg80211_chandef_dfs_required()

Some interface types don't require DFS (such as STATION, P2P_CLIENT
etc).  In order to centralize these decisions, make
cfg80211_chandef_dfs_required() take the iftype into consideration.

Signed-off-by: Luciano Coelho <luciano.coelho@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

net/mac80211/mesh.c

diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c
index 387f61c..9d29237 100644
--- a/net/mac80211/mesh.c
+++ b/net/mac80211/mesh.c
@@ -903,14 +903,15 @@
 	}
 
 	err = cfg80211_chandef_dfs_required(sdata->local->hw.wiphy,
-					    &params.chandef);
+					    &params.chandef,
+					    NL80211_IFTYPE_MESH_POINT);
 	if (err < 0)
 		return false;
-	if (err) {
-		params.radar_required = true;
+	if (err > 0)
 		/* TODO: DFS not (yet) supported */
 		return false;
-	}
+
+	params.radar_required = err;
 
 	if (cfg80211_chandef_identical(&params.chandef,
 				       &sdata->vif.bss_conf.chandef)) {