From patchwork Sun Jun 13 05:52:00 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kouhei Sutou X-Patchwork-Id: 105762 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 o5D61qQ9011485 for ; Sun, 13 Jun 2010 06:01:52 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751443Ab0FMGBu (ORCPT ); Sun, 13 Jun 2010 02:01:50 -0400 Received: from www.clear-code.com ([219.94.198.64]:36440 "EHLO mail.clear-code.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750973Ab0FMGBt (ORCPT ); Sun, 13 Jun 2010 02:01:49 -0400 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Sun, 13 Jun 2010 06:01:52 +0000 (UTC) X-Greylist: delayed 585 seconds by postgrey-1.27 at vger.kernel.org; Sun, 13 Jun 2010 02:01:49 EDT Received: from localhost (softbank218138133044.bbtec.net [218.138.133.44]) by mail.clear-code.com (Postfix) with ESMTPSA id EFF55AC084 for ; Sun, 13 Jun 2010 14:52:02 +0900 (JST) Date: Sun, 13 Jun 2010 14:52:00 +0900 (JST) Message-Id: <20100613.145200.1459063883179763823.kou@clear-code.com> To: linux-wireless@vger.kernel.org Subject: [PATCH] zd1211rw: ignore unknown regulatory domain. From: Kouhei Sutou 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 From c230320db45e9261814b69e7596d4f641c3c8aad Mon Sep 17 00:00:00 2001 From: Kouhei Sutou Date: Sun, 13 Jun 2010 14:37:54 +0900 Subject: [PATCH] zd1211rw: ignore unknown regulatory domain. Zd1211rw supports 7 regulatory domains (ZD_REGDOMAIN_*) but they aren't cover all regulatory domains. For example, PLANEX GW-US54GXS (2019:5303) uses 0x49 for its regulatory domain. If zd1211rw can't convert a regulatory domain to alpha2, it reports that initialization is failed. But we can change regulatory domain by another way (CRDA). So it seems that zd1211rw can ignore unknown regulatory domain. Signed-off-by: Kouhei Sutou --- drivers/net/wireless/zd1211rw/zd_mac.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c index 163a8a0..8b04d93 100644 --- a/drivers/net/wireless/zd1211rw/zd_mac.c +++ b/drivers/net/wireless/zd1211rw/zd_mac.c @@ -198,11 +198,9 @@ int zd_mac_init_hw(struct ieee80211_hw *hw) if (r) goto disable_int; - r = zd_reg2alpha2(mac->regdomain, alpha2); - if (r) - goto disable_int; + if (zd_reg2alpha2(mac->regdomain, alpha2)) + r = regulatory_hint(hw->wiphy, alpha2); - r = regulatory_hint(hw->wiphy, alpha2); disable_int: zd_chip_disable_int(chip); out: -- 1.7.1