From patchwork Thu Mar 1 14:18:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 10251533 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 6A06860211 for ; Thu, 1 Mar 2018 14:20:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 58C7527B81 for ; Thu, 1 Mar 2018 14:20:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5483528420; Thu, 1 Mar 2018 14:20:47 +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 2DED127F54 for ; Thu, 1 Mar 2018 14:20:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1031296AbeCAOUi (ORCPT ); Thu, 1 Mar 2018 09:20:38 -0500 Received: from mail-qt0-f196.google.com ([209.85.216.196]:40162 "EHLO mail-qt0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1031110AbeCAOUg (ORCPT ); Thu, 1 Mar 2018 09:20:36 -0500 Received: by mail-qt0-f196.google.com with SMTP id y6so7682518qtm.7 for ; Thu, 01 Mar 2018 06:20:36 -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=Ag1TduIe4mluK8H1OATzKoNRdVmPJn34K/dYwII1+64=; b=R7hx39/SHg0sHpS145jmS5JVgKMbFMQt4bgLKpW1dau3XPj0ebUdZXlnZSeXaobOOC xMk/c0YfEeuXip+pBktXzPfLBaZhqygz2GJLBAGQl1pJ/avNfLCqsJO+Jm092Cpo4BpK hVms9D36hQiU55lOatu67ORvuYY48mUs1V7GdHDKg4sNIPdqNqiQWI9T9e7xv3hWvygt RqzCse3PsfCvYn0kNCVsY4WWcFAIe6QK3JVfu+iPF8yRTeQJT8pTl1Q47dsVjLYkG9ic sSe+ycirrnjfrjGDjWbse+hNQl28E4gbH3gvBFk2hMZrbDtifGsxZXFPC+h4C8EHyklU jwAQ== 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=Ag1TduIe4mluK8H1OATzKoNRdVmPJn34K/dYwII1+64=; b=XAjxk88rnOiRtaTAFKw0+J5VXRHzgVp61tEmFt+cwhcMxFP1LoKDcNpz4pi2PYa/IJ VkKZL4SwkKa5lchs2z8S1/nlyqTz/8JlLVdZHjR9PXk+djx/2ccge6vH1fNTSs/GmMTV En525icGx4f6PtqloddGXjMSFa28UF/QZUACGoQkv2Vikvx8xV6Ro3iIliXCG6c/5DiG 7Y1aGsbUlJBNlq9D1vHJNKXUvkfxRRVYZE8yITyomd8v0pico8S+oAdU0Qv9WJjMpiiS +tslCnM8Q23K/9Q9UKX4g55yH7KA19g4wvuj0u77+IRc+GbtGgnXBSaCoqdr4UNvoUUV +alg== X-Gm-Message-State: AElRT7G16v3SJcQouTEX4wY5BGb24FSar2aZNBsoJvE+7r2p97+eMLpq AI14nOtWmtnpUNPgg3DR4I0f51zv X-Google-Smtp-Source: AG47ELu8V9Jbx5alJZs24J+awmDCOi7YXpPAtc5q2iX4i4RrBws70AP1lSdDk+SVrzo6DCg6H6i26Q== X-Received: by 10.200.65.208 with SMTP id o16mr3103852qtm.201.1519914035457; Thu, 01 Mar 2018 06:20:35 -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 v57sm3022181qtv.7.2018.03.01.06.20.34 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 Mar 2018 06:20:34 -0800 (PST) From: Sven Eckelmann To: linux-wireless@vger.kernel.org Cc: Kalle Valo , "Luis R. Rodriguez" , Sven Eckelmann Subject: [PATCH 03/52] ath: Add regulatory mapping for Japan (J56) Date: Thu, 1 Mar 2018 15:18:13 +0100 Message-Id: <20180301141902.24824-4-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: MKK Signed-off-by: Sven Eckelmann --- drivers/net/wireless/ath/regd_common.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/wireless/ath/regd_common.h b/drivers/net/wireless/ath/regd_common.h index a8c7f306fd7b..bba2d156cb21 100644 --- a/drivers/net/wireless/ath/regd_common.h +++ b/drivers/net/wireless/ath/regd_common.h @@ -99,6 +99,7 @@ enum EnumRd { MKK5_MKKB = 0x86, MKK5_MKKA2 = 0x87, MKK5_MKKC = 0x88, + MKK5_FCCA = 0x9A, MKK6_MKKB = 0x89, MKK6_MKKA2 = 0x8A, @@ -226,6 +227,7 @@ static struct reg_dmn_pair_mapping regDomainPairs[] = { {MKK5_MKKB, CTL_MKK, CTL_MKK}, {MKK5_MKKA2, CTL_MKK, CTL_MKK}, {MKK5_MKKC, CTL_MKK, CTL_MKK}, + {MKK5_FCCA, CTL_MKK, CTL_FCC}, {MKK6_MKKB, CTL_MKK, CTL_MKK}, {MKK6_MKKA1, CTL_MKK, CTL_MKK}, @@ -405,6 +407,7 @@ static struct country_code_to_enum_rd allCountries[] = { {CTRY_JAPAN52, MKK12_MKKA1, "JP"}, {CTRY_JAPAN53, MKK12_MKKC, "JP"}, {CTRY_JAPAN54, MKK12_MKKA2, "JP"}, + {CTRY_JAPAN56, MKK5_FCCA, "JP"}, {CTRY_JAPAN57, MKK13_MKKB, "JP"}, {CTRY_JAPAN58, MKK14_MKKA1, "JP"}, {CTRY_JAPAN59, MKK15_MKKA1, "JP"},