Received: by 2002:ac0:a5a7:0:0:0:0:0 with SMTP id m36-v6csp1162957imm; Wed, 1 Aug 2018 11:13:22 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfXGVOAkwh/jHusSLCa26sJUV7bNLS4gda4HOHNuSLWXJGtejY/DxxSMCQj1mbLAVn+CXxN X-Received: by 2002:a17:902:b709:: with SMTP id d9-v6mr25806573pls.138.1533147202315; Wed, 01 Aug 2018 11:13:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533147202; cv=none; d=google.com; s=arc-20160816; b=dx3Fgl42GWhhsOGheZV26YrNimlrb/o1WqWukqf3ORtFV9EpzoXnfeYRxjIg3p4Kbt cIO20kGscCx/FSXf7bgoqV8OmCchvaMwHWAS1g5SXs1YFpsQPaLVHHv17EA3I/H+iuDy 8u5hkoALiWcbFlEAA5zGoc5mmpXVteYhwStkGU6AkMwTpeCusuEp4MLFuToeyK8OcGpI 5i6Wz9+usoPMF2JtOEVsbslBGv6H0z+oHy3VyWwRy9zWS0sl2Iur2PtkPRdnBFPji/Xb OirnKOMIUrR/TATHw8KSWgoNlp/qns5X2uUuEBXWiGZsA4i9LFcCmsrlsbKhDzoyPHui en1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=hs2QQXamOPep9dKelgo6ctJ+vJyVcQEX40TmN2cCDJM=; b=NVK9On5zS0VJNBmA+MhVkjj2WPPdKTYUCdt0OZrm8IJVOB777sqvRf0fXmbKIp9sTj CxSSLAWX+HalBRBRS4uQuZrRA/fe1KrEeTYsqYcClCaRie+IQcl8Pcorv4qQb7AxYffg +stAQKbRImbWP9OuJdS1FS4OvFFVMx9T0c/1DxaEWsOkddswU508uwv+S/ZFM/u+jqOD GSxIxNq1vL4cku+b8W00JUMNagilj9xQ2vkKjq5EcxelGmc15m9T9RYVYjeZs+g6X+CK 0mbwauMBCMlIGmE4UeN8epx8HF/0cyNsO2aaB6Csvy4fO5aY7TX1zgiVE6dHKjDNSK9s utdw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id bg5-v6si16028265plb.368.2018.08.01.11.13.08; Wed, 01 Aug 2018 11:13:22 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732587AbeHAT6g (ORCPT + 99 others); Wed, 1 Aug 2018 15:58:36 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:50080 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2405691AbeHATIf (ORCPT ); Wed, 1 Aug 2018 15:08:35 -0400 Received: from localhost (D57E6652.static.ziggozakelijk.nl [213.126.102.82]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 3CADE13E9; Wed, 1 Aug 2018 17:16:40 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sven Eckelmann , Kalle Valo , Sasha Levin Subject: [PATCH 4.14 096/246] ath: Add regulatory mapping for Tanzania Date: Wed, 1 Aug 2018 18:50:06 +0200 Message-Id: <20180801165016.313288974@linuxfoundation.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180801165011.700991984@linuxfoundation.org> References: <20180801165011.700991984@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Sven Eckelmann [ Upstream commit 667ddac5745fb9fddfe8f7fd2523070f50bd4442 ] 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: ETSI * 5GHz: FCC Signed-off-by: Sven Eckelmann Signed-off-by: Kalle Valo Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/net/wireless/ath/regd.h | 1 + drivers/net/wireless/ath/regd_common.h | 1 + 2 files changed, 2 insertions(+) --- a/drivers/net/wireless/ath/regd.h +++ b/drivers/net/wireless/ath/regd.h @@ -170,6 +170,7 @@ enum CountryCode { CTRY_SWITZERLAND = 756, CTRY_SYRIA = 760, CTRY_TAIWAN = 158, + CTRY_TANZANIA = 834, CTRY_THAILAND = 764, CTRY_TRINIDAD_Y_TOBAGO = 780, CTRY_TUNISIA = 788, --- a/drivers/net/wireless/ath/regd_common.h +++ b/drivers/net/wireless/ath/regd_common.h @@ -463,6 +463,7 @@ static struct country_code_to_enum_rd al {CTRY_SWITZERLAND, ETSI1_WORLD, "CH"}, {CTRY_SYRIA, NULL1_WORLD, "SY"}, {CTRY_TAIWAN, APL3_FCCA, "TW"}, + {CTRY_TANZANIA, APL1_WORLD, "TZ"}, {CTRY_THAILAND, FCC3_WORLD, "TH"}, {CTRY_TRINIDAD_Y_TOBAGO, FCC3_WORLD, "TT"}, {CTRY_TUNISIA, ETSI3_WORLD, "TN"},