From patchwork Thu Mar 1 14:18:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 10251535 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 1456560211 for ; Thu, 1 Mar 2018 14:20:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 041F827F8F for ; Thu, 1 Mar 2018 14:20:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 021B328372; Thu, 1 Mar 2018 14:20:50 +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 377CD28332 for ; Thu, 1 Mar 2018 14:20:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1031255AbeCAOUl (ORCPT ); Thu, 1 Mar 2018 09:20:41 -0500 Received: from mail-qk0-f195.google.com ([209.85.220.195]:44543 "EHLO mail-qk0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1031110AbeCAOUi (ORCPT ); Thu, 1 Mar 2018 09:20:38 -0500 Received: by mail-qk0-f195.google.com with SMTP id v124so7670307qkh.11 for ; Thu, 01 Mar 2018 06:20:38 -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=PayKlKbwgJp/1Hg4B6+eEtKVuOVDJWAMyRZhNFaKSEg=; b=XHxcpSByyVE/1W+jEyTLBYIgqv4/FY/URS9ocQ5syuGvtAdY5cwgzj3cgq8rrlfriP G5qB09uuFlSSv46FN2jl8/Mf5oKyehN423BroXq69pjFz2OrWUCSEoSiji+HZek1BWTz YiPpIwEMTpuH4yur7ttTEPwCOkIvhFptelAz77XLf86n0Xx4GoHWQKGNk4j8YqSmZ65H o30+k7Ebra8WMk3oIG5qAGahODevWw+LMwR9+I75wTMhm1/grskLJ1CS9HAenqDjV910 1tSlQMVRsVMzlX1mCTcbmVhtUiIrqOOOhPaVS1wlZOmSkdLDCyt2wdyJZvvFb2awxaK5 YQ0w== 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=PayKlKbwgJp/1Hg4B6+eEtKVuOVDJWAMyRZhNFaKSEg=; b=Ol6PkoL0tXbFl6scTH7++0jhUizctYwmqwQdy5m8HlESd2kW4wtsnaFJgWKGbNxIIU kuTXLzjcPiOisaWQn12/4enhBXu3EhoXmVpTkNPtsGeN159DbMKifFIrKJbp+bTsS+Rk Inb9KD2r9FVvKaD/+OoAP0nWeLyokZ8u/9+1ddkufH4XP2/7Nvga7IMjhXOtyZlnkQz9 i2Cue0WbX0tVRU6Ew0bDgF2T8XwJflXr4BVMB0MweYH6TKgzPCeXvgDkVJBj0F1G7dn/ b47UREMgjiHtSeT2cQMFy+O29Y1TQv/84tqBo9EvIlA8XF6ATuWYeGxRnwIbI3y2Ri/V XACA== X-Gm-Message-State: AElRT7GLd6b5gdMX0ZW7wIEmrKOxSd95G0UVUPtl8jZ0aTtzY3EDdAqK +RndvwH4ISQ5tiTLzBTC0EfOxXUE X-Google-Smtp-Source: AG47ELuZLliBcdLAJbpo4XA1G0tIa9ky7XwqAsQXaV1/mH4oP/sKuaKxJSu05fqj5w845qeSAa+uKA== X-Received: by 10.55.15.92 with SMTP id z89mr3114719qkg.301.1519914037991; Thu, 01 Mar 2018 06:20:37 -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 12sm2791270qkx.27.2018.03.01.06.20.37 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 Mar 2018 06:20:37 -0800 (PST) From: Sven Eckelmann To: linux-wireless@vger.kernel.org Cc: Kalle Valo , "Luis R. Rodriguez" , Sven Eckelmann Subject: [PATCH 04/52] ath: Add regulatory mapping for Japan KDDI Date: Thu, 1 Mar 2018 15:18:14 +0100 Message-Id: <20180301141902.24824-5-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: MKK * 5GHz: MKK 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 e7b43901d195..a615a878ac40 100644 --- a/drivers/net/wireless/ath/regd.h +++ b/drivers/net/wireless/ath/regd.h @@ -246,6 +246,7 @@ enum CountryCode { CTRY_JAPAN57 = 4057, CTRY_JAPAN58 = 4058, CTRY_JAPAN59 = 4059, + CTRY_XA = 4100, CTRY_AUSTRALIA2 = 5000, CTRY_CANADA2 = 5001, CTRY_BELGIUM2 = 5002 diff --git a/drivers/net/wireless/ath/regd_common.h b/drivers/net/wireless/ath/regd_common.h index bba2d156cb21..e430e12f90e8 100644 --- a/drivers/net/wireless/ath/regd_common.h +++ b/drivers/net/wireless/ath/regd_common.h @@ -411,6 +411,7 @@ static struct country_code_to_enum_rd allCountries[] = { {CTRY_JAPAN57, MKK13_MKKB, "JP"}, {CTRY_JAPAN58, MKK14_MKKA1, "JP"}, {CTRY_JAPAN59, MKK15_MKKA1, "JP"}, + {CTRY_XA, MKK5_MKKA2, "XA"}, {CTRY_JORDAN, ETSI2_WORLD, "JO"}, {CTRY_KAZAKHSTAN, NULL1_WORLD, "KZ"},