Return-path: 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 S1752187AbaAOPu6 (ORCPT ); Wed, 15 Jan 2014 10:50:58 -0500 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 2/6] cfg80211: Add Kconfig option for cellular BS hints Date: Wed, 15 Jan 2014 17:52:38 +0200 Message-Id: <1389801162-14488-3-git-send-email-ilan.peer@intel.com> (sfid-20140115_165103_734120_6A70321F) 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 List-ID: Move the regulatory cellular base station hints support under a specific configuration option and make the option depend on CFG80211_CERTIFICATION_ONUS. Signed-off-by: Ilan Peer --- net/wireless/Kconfig | 7 +++++++ net/wireless/reg.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/net/wireless/Kconfig b/net/wireless/Kconfig index 16d08b3..81c05e4 100644 --- a/net/wireless/Kconfig +++ b/net/wireless/Kconfig @@ -95,6 +95,13 @@ config CFG80211_CERTIFICATION_ONUS you are a wireless researcher and are working in a controlled and approved environment by your local regulatory agency. +config CFG80211_REG_CELLULAR_HINTS + bool "cfg80211 regulatory support for cellular base station hints" + depends on CFG80211_CERTIFICATION_ONUS + ---help--- + This option adds support for drivers that can receive regulatory + hints from cellular base stations + config CFG80211_DEFAULT_PS bool "enable powersave by default" depends on CFG80211 diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 80fe9b3..2449dce 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -992,7 +992,7 @@ bool reg_last_request_cell_base(void) return reg_request_cell_base(get_last_request()); } -#ifdef CONFIG_CFG80211_CERTIFICATION_ONUS +#ifdef CONFIG_CFG80211_REG_CELLULAR_HINTS /* Core specific check */ static enum reg_request_treatment reg_ignore_cell_hint(struct regulatory_request *pending_request) -- 1.7.10.4