From patchwork Wed Jun 16 12:55:23 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kouhei Sutou X-Patchwork-Id: 106487 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o5GCqHn8002700 for ; Wed, 16 Jun 2010 12:55:38 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755075Ab0FPMzi (ORCPT ); Wed, 16 Jun 2010 08:55:38 -0400 Received: from www.clear-code.com ([219.94.198.64]:54026 "EHLO mail.clear-code.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753546Ab0FPMzh (ORCPT ); Wed, 16 Jun 2010 08:55:37 -0400 Received: from localhost (e0109-119-107-229-151.uqwimax.jp [119.107.229.151]) by mail.clear-code.com (Postfix) with ESMTPSA id C69A1AC084; Wed, 16 Jun 2010 21:55:34 +0900 (JST) Date: Wed, 16 Jun 2010 21:55:23 +0900 (JST) Message-Id: <20100616.215523.1718341995174283889.kou@clear-code.com> To: mcgrof@gmail.com Cc: Stephen.Chen@atheros.com, David.Quan@atheros.com, linux-wireless@vger.kernel.org, Michael.Green@atheros.com Subject: Re: [PATCH] zd1211rw: ignore unknown regulatory domain. From: Kouhei Sutou In-Reply-To: References: <20100615.232558.867740727379709943.kou@clear-code.com> X-Mailer: Mew version 6.3 on Emacs 23.2 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 X-Virus-Scanned: clamav-milter 0.96 at lenny X-Virus-Status: Clean Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Wed, 16 Jun 2010 12:55:39 +0000 (UTC) From a530e66e6e995d8e8bc00ece2a9b3540ef88688f Mon Sep 17 00:00:00 2001 From: Kouhei Sutou Date: Wed, 16 Jun 2010 21:53:59 +0900 Subject: [PATCH] zd1211rw: add 0x49 -> JP regulatory domain map 0x49 is used by PLANEX GW-US54GXS (2019:5303). Signed-off-by: Kouhei Sutou --- drivers/net/wireless/zd1211rw/zd_mac.c | 1 + drivers/net/wireless/zd1211rw/zd_mac.h | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c index 163a8a0..faf45f1 100644 --- a/drivers/net/wireless/zd1211rw/zd_mac.c +++ b/drivers/net/wireless/zd1211rw/zd_mac.c @@ -43,6 +43,7 @@ static struct zd_reg_alpha2_map reg_alpha2_map[] = { { ZD_REGDOMAIN_ETSI, "DE" }, /* Generic ETSI, use most restrictive */ { ZD_REGDOMAIN_JAPAN, "JP" }, { ZD_REGDOMAIN_JAPAN_ADD, "JP" }, + { ZD_REGDOMAIN_JAPAN_GW_US54GXS, "JP" }, { ZD_REGDOMAIN_SPAIN, "ES" }, { ZD_REGDOMAIN_FRANCE, "FR" }, }; diff --git a/drivers/net/wireless/zd1211rw/zd_mac.h b/drivers/net/wireless/zd1211rw/zd_mac.h index 630c298..7ab19d5 100644 --- a/drivers/net/wireless/zd1211rw/zd_mac.h +++ b/drivers/net/wireless/zd1211rw/zd_mac.h @@ -214,6 +214,7 @@ struct zd_mac { #define ZD_REGDOMAIN_FRANCE 0x32 #define ZD_REGDOMAIN_JAPAN_ADD 0x40 #define ZD_REGDOMAIN_JAPAN 0x41 +#define ZD_REGDOMAIN_JAPAN_GW_US54GXS 0x49 enum { MIN_CHANNEL24 = 1, -- 1.7.1