diff mbox

[v3,1/7] nl80211: make sure we check for DFS with mesh channel switch

Message ID 1392906986-12275-2-git-send-email-luca@coelho.fi (mailing list archive)
State Not Applicable, archived
Headers show

Commit Message

Luca Coelho Feb. 20, 2014, 2:36 p.m. UTC 
From: Luciano Coelho <luciano.coelho@intel.com>

Since mesh support for DFS channels was added, we also need to check
for DFS channels when performing a channel switch with
NL80211_IFTYPE_MESHPOINT.

Signed-off-by: Luciano Coelho <luciano.coelho@intel.com>
---
 net/wireless/nl80211.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Johannes Berg Feb. 21, 2014, 8:31 a.m. UTC | #1 
On Thu, 2014-02-20 at 16:36 +0200, Luciano Coelho wrote:
> From: Luciano Coelho <luciano.coelho@intel.com>
> 
> Since mesh support for DFS channels was added, we also need to check
> for DFS channels when performing a channel switch with
> NL80211_IFTYPE_MESHPOINT.

Applied, but I've changed it to a switch statement and did a small code
cleanup as well.

johannes

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 1797864..b78d734 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -5912,7 +5912,8 @@  skip_beacons:
 
 	if (dev->ieee80211_ptr->iftype == NL80211_IFTYPE_AP ||
 	    dev->ieee80211_ptr->iftype == NL80211_IFTYPE_P2P_GO ||
-	    dev->ieee80211_ptr->iftype == NL80211_IFTYPE_ADHOC) {
+	    dev->ieee80211_ptr->iftype == NL80211_IFTYPE_ADHOC ||
+	    dev->ieee80211_ptr->iftype == NL80211_IFTYPE_MESH_POINT) {
 		err = cfg80211_chandef_dfs_required(wdev->wiphy,
 						    &params.chandef);
 		if (err < 0) {