From patchwork Mon Jan 4 08:37:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keng-Yu Lin X-Patchwork-Id: 562276 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 4C2D71402DE; Mon, 4 Jan 2016 19:38:12 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1aG0eV-00035X-Cp; Mon, 04 Jan 2016 08:38:07 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1aG0eS-00033e-O9 for kernel-team@lists.ubuntu.com; Mon, 04 Jan 2016 08:38:04 +0000 Received: from 61-231-142-110.dynamic.hinet.net ([61.231.142.110] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1aG0eR-0004Po-Ve; Mon, 04 Jan 2016 08:38:04 +0000 From: Keng-Yu Lin To: kernel-team@lists.ubuntu.com Subject: [PATCH 6/8] [Vivid][SRU re-spin][SAUCE] mwifiex: correction in region code to country mapping Date: Mon, 4 Jan 2016 16:37:32 +0800 Message-Id: <1451896654-24765-7-git-send-email-kengyu@canonical.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1451896654-24765-1-git-send-email-kengyu@canonical.com> References: <1451896654-24765-1-git-send-email-kengyu@canonical.com> Cc: alex.kaluzhny@canonical.com, gavin.lin@canonical.com, tim.chen119@canonical.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com From: Amitkumar Karwar EU is not a valid country in db.txt file. Hence regulatory_hint returns failure if EEPROM provides region code as 0x30. Let's use FR for 0x30. BugLink: https://launchpad.net/bugs/1528910 Signed-off-by: Amitkumar Karwar Signed-off-by: Cathy Luo Signed-off-by: Keng-Yu Lin Tested-by: Gavin Lin Reviewed-by: Wen-chien Jesse Sung --- drivers/net/wireless/mwifiex/cfp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/mwifiex/cfp.c b/drivers/net/wireless/mwifiex/cfp.c index e7329eb..3362f8d 100644 --- a/drivers/net/wireless/mwifiex/cfp.c +++ b/drivers/net/wireless/mwifiex/cfp.c @@ -168,7 +168,7 @@ struct region_code_mapping { static struct region_code_mapping region_code_mapping_t[] = { { 0x10, "US " }, /* US FCC */ { 0x20, "CA " }, /* IC Canada */ - { 0x30, "EU " }, /* ETSI */ + { 0x30, "FR " }, /* France */ { 0x31, "ES " }, /* Spain */ { 0x32, "FR " }, /* France */ { 0x40, "JP " }, /* Japan */