From patchwork Mon Jan 27 10:21:57 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peer, Ilan" X-Patchwork-Id: 3541981 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 8EF039F391 for ; Mon, 27 Jan 2014 10:21:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B6D282013D for ; Mon, 27 Jan 2014 10:21:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EBF8D20103 for ; Mon, 27 Jan 2014 10:21:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753737AbaA0KUr (ORCPT ); Mon, 27 Jan 2014 05:20:47 -0500 Received: from mga11.intel.com ([192.55.52.93]:22536 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752812AbaA0KU1 (ORCPT ); Mon, 27 Jan 2014 05:20:27 -0500 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP; 27 Jan 2014 02:20:27 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.95,728,1384329600"; d="scan'208";a="471327392" Received: from unknown (HELO ipeer-e6430-1.jer.intel.com) ([10.12.217.190]) by fmsmga002.fm.intel.com with ESMTP; 27 Jan 2014 02:20:15 -0800 From: Ilan Peer To: linux-wireless@vger.kernel.org Cc: wireless-regdb@lists.infradead.org, Ilan Peer Subject: [PATCH v3 5/6] cfg80211: Enable GO operation on indoor channels Date: Mon, 27 Jan 2014 12:21:57 +0200 Message-Id: <1390818118-27261-6-git-send-email-ilan.peer@intel.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1390818118-27261-1-git-send-email-ilan.peer@intel.com> References: <1390818118-27261-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.4 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 Allow GO operation on a channel marked with IEEE80211_CHAN_INDOOR_ONLY iff there is a user hint indicating that the platform is operating in an indoor environment, i.e., the platform is a printer or media center device. Signed-off-by: Ilan Peer --- net/wireless/chan.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/net/wireless/chan.c b/net/wireless/chan.c index 87a9d0e..4ae3cd0 100644 --- a/net/wireless/chan.c +++ b/net/wireless/chan.c @@ -611,14 +611,20 @@ 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) { struct wireless_dev *wdev_iter; + struct wiphy *wiphy = wiphy_idx_to_wiphy(rdev->wiphy_idx); ASSERT_RTNL(); + if (regulatory_ir_allowed(wiphy, chan)) + return true; + if (!(chan->flags & IEEE80211_CHAN_GO_CONCURRENT)) return false;