From patchwork Thu Mar 1 14:18:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 10251555 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A7AAA60211 for ; Thu, 1 Mar 2018 14:21:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 96A04284D1 for ; Thu, 1 Mar 2018 14:21:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 94F4428478; Thu, 1 Mar 2018 14:21:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5BF432835B for ; Thu, 1 Mar 2018 14:21:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1031328AbeCAOVF (ORCPT ); Thu, 1 Mar 2018 09:21:05 -0500 Received: from mail-qk0-f194.google.com ([209.85.220.194]:42347 "EHLO mail-qk0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1031274AbeCAOVD (ORCPT ); Thu, 1 Mar 2018 09:21:03 -0500 Received: by mail-qk0-f194.google.com with SMTP id b130so7667732qkg.9 for ; Thu, 01 Mar 2018 06:21:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openmesh-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=O2H8gbAFKWwg9Cf6nsai1Au21OeqdQlBx6q7HX6X7j0=; b=izRZYZKwjny+J6YVupG7HeKa01sn+iZeo/sWB1KRWDK3gie5A1MhTzv8e/8WucQpO9 0u2G2aZadfzYyFDoSQ30IVUfFxwlqVfp77W99nwJqy5I+CzO+oB+RN8GH+QSzpLsIewk YrcHl57G5sgMUdu1zIoCF+XqNU/qik6FAs5S9e60ZOQt+K0xvecTv13vD4dZ5wGRfm7m 5bOY/QN+7GMDHdhhTpRts8d7TG6slYBXTfJVf2wI+S6e1a/G62SBVmIRh3uokDqY3PZP A5TJ7CCWXTDW3suIjfnY0QM48FjXSif/+FC6xKwXg4iY0AI7AGc69NxhjillBp1u5Do0 TLjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=O2H8gbAFKWwg9Cf6nsai1Au21OeqdQlBx6q7HX6X7j0=; b=XEfHvofbGotuFNlBMo12lfFUm54ZsgU/bnXI6u/kzfnUN3BahAFEC80lYoSTKLFwkc BlRuI3zWekIJ6fM/rZoP3L8q6p0khr1WXB20R9Q2ghSzmPz6/vkj+Lkhr7sRw4NHbcAo GthJ5nozR7KvgM10P0Y7/ZdfusWEGhSCwTExA39VOSbA0z5YGiL/AfV+uWMRJNA1QjBT 3nyL2lhcvNMblh2fQslAReBpRD04f3vumxr9he7Duh3wdors6EP+RuYpd7Hh1f50RFcZ o4AnAiJysDotqEYDImRilkgMGy8jxfmLpMnmhnJRc+kPvZ5Enw0roeXweaYTyuKLlglI Ml9w== X-Gm-Message-State: AElRT7EswnMmikJ9cgxukqOsQZyPqPEzA7/EQAtQVx1FBJc5U/SkP4i3 Rg+cfw62xTL/4TrS7PCi98AkFsYj+MU= X-Google-Smtp-Source: AG47ELsSMiebGkcYp8DzZkc2rQyuLJovqzEDAA2LMkliFfnXA919nnMtqY6HVOWPfnGcIG/lhzF0Ow== X-Received: by 10.55.27.18 with SMTP id b18mr2851100qkb.355.1519914063001; Thu, 01 Mar 2018 06:21:03 -0800 (PST) Received: from sven-desktop.home.narfation.org (p2003007C6F4301EA1FEAE4CE1DF3DE58.dip0.t-ipconnect.de. [2003:7c:6f43:1ea:1fea:e4ce:1df3:de58]) by smtp.gmail.com with ESMTPSA id v55sm3048411qtc.14.2018.03.01.06.21.02 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 Mar 2018 06:21:02 -0800 (PST) From: Sven Eckelmann To: linux-wireless@vger.kernel.org Cc: Kalle Valo , "Luis R. Rodriguez" , Sven Eckelmann Subject: [PATCH 14/52] ath: Add regulatory mapping for United States for AP Date: Thu, 1 Mar 2018 15:18:24 +0100 Message-Id: <20180301141902.24824-15-sven.eckelmann@openmesh.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180301141902.24824-1-sven.eckelmann@openmesh.com> References: <20180301141902.24824-1-sven.eckelmann@openmesh.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The country code is used by the ath to detect the ISO 3166-1 alpha-2 name and to select the correct conformance test limits (CTL) for a country. If the country isn't available and it is still programmed in the EEPROM then it will cause an error and stop the initialization with: Invalid EEPROM contents The current CTL mappings for this country are: * 2.4GHz: FCC * 5GHz: FCC Signed-off-by: Sven Eckelmann --- drivers/net/wireless/ath/regd.h | 1 + drivers/net/wireless/ath/regd_common.h | 1 + 2 files changed, 2 insertions(+) diff --git a/drivers/net/wireless/ath/regd.h b/drivers/net/wireless/ath/regd.h index 908163948d59..490efdcddf93 100644 --- a/drivers/net/wireless/ath/regd.h +++ b/drivers/net/wireless/ath/regd.h @@ -186,6 +186,7 @@ enum CountryCode { CTRY_UKRAINE = 804, CTRY_UNITED_KINGDOM = 826, CTRY_UNITED_STATES = 840, + CTRY_UNITED_STATES2 = 841, CTRY_UNITED_STATES_FCC49 = 842, CTRY_URUGUAY = 858, CTRY_UZBEKISTAN = 860, diff --git a/drivers/net/wireless/ath/regd_common.h b/drivers/net/wireless/ath/regd_common.h index a00be9604d21..5cbd76235248 100644 --- a/drivers/net/wireless/ath/regd_common.h +++ b/drivers/net/wireless/ath/regd_common.h @@ -478,6 +478,7 @@ static struct country_code_to_enum_rd allCountries[] = { {CTRY_UAE, NULL1_WORLD, "AE"}, {CTRY_UNITED_KINGDOM, ETSI1_WORLD, "GB"}, {CTRY_UNITED_STATES, FCC3_FCCA, "US"}, + {CTRY_UNITED_STATES2, FCC6_FCCA, "US"}, /* This "PS" is for US public safety actually... to support this we * would need to assign new special alpha2 to CRDA db as with the world * regdomain and use another alpha2 */