From patchwork Mon Jan 4 08:37:33 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: 562277 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 135111402DE; Mon, 4 Jan 2016 19:38:19 +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 1aG0eb-00038d-H1; Mon, 04 Jan 2016 08:38:13 +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 1aG0eX-00036b-0F for kernel-team@lists.ubuntu.com; Mon, 04 Jan 2016 08:38:09 +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 1aG0eW-0004Pt-7p; Mon, 04 Jan 2016 08:38:08 +0000 From: Keng-Yu Lin To: kernel-team@lists.ubuntu.com Subject: [PATCH 7/8] [Vivid][SRU re-spin][SAUCE] mwifiex: update region_code_index array Date: Mon, 4 Jan 2016 16:37:33 +0800 Message-Id: <1451896654-24765-8-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 This array contains list of supported region codes. It is changed to make it aligned with region code to country mapping table in driver. BugLink: https://launchpad.net/bugs/1528910 Signed-off-by: Amitkumar Karwar Signed-off-by: Keng-Yu Lin Tested-by: Gavin Lin Reviewed-by: Wen-chien Jesse Sung --- drivers/net/wireless/mwifiex/cfp.c | 2 +- drivers/net/wireless/mwifiex/main.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/mwifiex/cfp.c b/drivers/net/wireless/mwifiex/cfp.c index 3362f8d..cf0e515 100644 --- a/drivers/net/wireless/mwifiex/cfp.c +++ b/drivers/net/wireless/mwifiex/cfp.c @@ -67,7 +67,7 @@ static u8 supported_rates_bg[BG_SUPPORTED_RATES] = { 0x02, 0x04, 0x0b, 0x0c, 0x60, 0x6c, 0 }; u16 region_code_index[MWIFIEX_MAX_REGION_CODE] = { 0x00, 0x10, 0x20, 0x30, - 0x32, 0x40, 0x41, 0xff }; + 0x31, 0x32, 0x40, 0x41, 0x50 }; static u8 supported_rates_n[N_SUPPORTED_RATES] = { 0x02, 0x04, 0 }; diff --git a/drivers/net/wireless/mwifiex/main.h b/drivers/net/wireless/mwifiex/main.h index b8c4a40..ad1fe7b 100644 --- a/drivers/net/wireless/mwifiex/main.h +++ b/drivers/net/wireless/mwifiex/main.h @@ -75,7 +75,7 @@ enum { #define MWIFIEX_KEY_BUFFER_SIZE 16 #define MWIFIEX_DEFAULT_LISTEN_INTERVAL 10 -#define MWIFIEX_MAX_REGION_CODE 8 +#define MWIFIEX_MAX_REGION_CODE 9 #define DEFAULT_BCN_AVG_FACTOR 8 #define DEFAULT_DATA_AVG_FACTOR 8