From patchwork Thu Feb 20 14:36:20 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Coelho X-Patchwork-Id: 3687211 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id B7E16BF13A for ; Thu, 20 Feb 2014 14:36:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D136620158 for ; Thu, 20 Feb 2014 14:36:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 171F62013A for ; Thu, 20 Feb 2014 14:36:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752840AbaBTOge (ORCPT ); Thu, 20 Feb 2014 09:36:34 -0500 Received: from emh07.mail.saunalahti.fi ([62.142.5.117]:35657 "EHLO emh07.mail.saunalahti.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750959AbaBTOgd (ORCPT ); Thu, 20 Feb 2014 09:36:33 -0500 Received: from porter.coelho.fi (a88-113-225-236.elisa-laajakaista.fi [88.113.225.236]) by emh07.mail.saunalahti.fi (Postfix) with ESMTP id 50AA03FD4; Thu, 20 Feb 2014 16:36:32 +0200 (EET) From: Luciano Coelho To: linux-wireless@vger.kernel.org Cc: johannes@sipsolutions.net, michal.kazior@tieto.com, sw@simonwunderlich.de, bzhao@marvell.com, arend@broadcom.com Subject: [PATCH v3 1/7] nl80211: make sure we check for DFS with mesh channel switch Date: Thu, 20 Feb 2014 16:36:20 +0200 Message-Id: <1392906986-12275-2-git-send-email-luca@coelho.fi> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1392906986-12275-1-git-send-email-luca@coelho.fi> References: <1392906986-12275-1-git-send-email-luca@coelho.fi> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Luciano Coelho 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 --- net/wireless/nl80211.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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, ¶ms.chandef); if (err < 0) {