From patchwork Sun May 11 08:50:48 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emmanuel Grumbach X-Patchwork-Id: 4149921 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 C51EDBFF02 for ; Sun, 11 May 2014 08:53:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 007FD202FE for ; Sun, 11 May 2014 08:53:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2811F2028D for ; Sun, 11 May 2014 08:53:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758073AbaEKIxs (ORCPT ); Sun, 11 May 2014 04:53:48 -0400 Received: from mga01.intel.com ([192.55.52.88]:57928 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752038AbaEKIxq (ORCPT ); Sun, 11 May 2014 04:53:46 -0400 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP; 11 May 2014 01:53:45 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.97,1028,1389772800"; d="scan'208";a="529861638" Received: from ilanxp1.jer.intel.com (HELO egrumbacLAB.jer.intel.com) ([10.12.217.133]) by fmsmga001.fm.intel.com with ESMTP; 11 May 2014 01:53:43 -0700 From: Emmanuel Grumbach To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, Arik Nemtsov , Arik Nemtsov , Emmanuel Grumbach Subject: [PATCH 5/7] cfg80211: accept world/same regdom from driver/user hints Date: Sun, 11 May 2014 11:50:48 +0300 Message-Id: <1399798250-20987-6-git-send-email-emmanuel.grumbach@intel.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1399798250-20987-1-git-send-email-emmanuel.grumbach@intel.com> References: <1399798250-20987-1-git-send-email-emmanuel.grumbach@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.5 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 From: Arik Nemtsov Allow driver and user hints to set the "world" regulatory domain, and also allow them to set the same reg-domain. This is useful when sending an unknown-country ("99") request to a wiphy-specific regulatory source, requesting it to provide the current alpha2. It may return an updated regdomain for the "world" alpha2. Note there's a check for regdom change at the request level, so the case where the same alpha2 is set repeatedly is still optimized. Change-Id: Iff04537b26a4c4153b78232ea33a5525512f902a Signed-off-by: Arik Nemtsov Signed-off-by: Emmanuel Grumbach --- net/wireless/reg.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/net/wireless/reg.c b/net/wireless/reg.c index c429ec5..d6b83f9 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -2539,9 +2539,6 @@ static int reg_set_rd_user(const struct ieee80211_regdomain *rd, { const struct ieee80211_regdomain *intersected_rd = NULL; - if (!regdom_changes(rd->alpha2)) - return -EALREADY; - if (!is_valid_rd(rd)) { pr_err("Invalid regulatory domain detected:\n"); print_regdomain_info(rd); @@ -2572,12 +2569,6 @@ static int reg_set_rd_driver(const struct ieee80211_regdomain *rd, const struct ieee80211_regdomain *tmp; struct wiphy *request_wiphy; - if (is_world_regdom(rd->alpha2)) - return -EINVAL; - - if (!regdom_changes(rd->alpha2)) - return -EALREADY; - if (!is_valid_rd(rd)) { pr_err("Invalid regulatory domain detected:\n"); print_regdomain_info(rd);