From patchwork Wed Jan 15 15:52:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peer, Ilan" X-Patchwork-Id: 3492311 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 9E973C02DC for ; Wed, 15 Jan 2014 15:51:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B75E32011B for ; Wed, 15 Jan 2014 15:51:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A9BB42010C for ; Wed, 15 Jan 2014 15:51:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752209AbaAOPvF (ORCPT ); Wed, 15 Jan 2014 10:51:05 -0500 Received: from mga02.intel.com ([134.134.136.20]:5806 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752187AbaAOPvD (ORCPT ); Wed, 15 Jan 2014 10:51:03 -0500 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP; 15 Jan 2014 07:51:03 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.95,663,1384329600"; d="scan'208";a="467114113" Received: from unknown (HELO ipeer-e6430-1.jer.intel.com) ([10.12.217.171]) by orsmga002.jf.intel.com with ESMTP; 15 Jan 2014 07:51:01 -0800 From: Ilan Peer To: linux-wireless@vger.kernel.org Cc: mcgrof@do-not-panic.com, wireless-regdb@lists.infradead.org, Ilan Peer Subject: [PATCH v2 5/6] cfg80211: Enable GO operation on indoor channels Date: Wed, 15 Jan 2014 17:52:41 +0200 Message-Id: <1389801162-14488-6-git-send-email-ilan.peer@intel.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1389801162-14488-1-git-send-email-ilan.peer@intel.com> References: <1389801162-14488-1-git-send-email-ilan.peer@intel.com> 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.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 Signed-off-by: Ilan Peer --- net/wireless/chan.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/net/wireless/chan.c b/net/wireless/chan.c index d47856b..36f2f5f 100644 --- a/net/wireless/chan.c +++ b/net/wireless/chan.c @@ -611,6 +611,8 @@ EXPORT_SYMBOL(cfg80211_chandef_usable); * IEEE80211_CHAN_GO_CONCURRENT and there is an additional station interface * associated to an AP on the same channel or on the same UNII band * (assuming that the AP is an authorized master). + * In addition allow the GO to operate on a channel on which indoor operation is + * allowed, iff we are currently operating in an indoor environment. */ static bool cfg80211_go_permissive_chan(struct cfg80211_registered_device *rdev, struct ieee80211_channel *chan) @@ -619,6 +621,9 @@ static bool cfg80211_go_permissive_chan(struct cfg80211_registered_device *rdev, ASSERT_RTNL(); + if (regulatory_ir_allowed(chan)) + return true; + if (!(chan->flags & IEEE80211_CHAN_GO_CONCURRENT)) return false;