From patchwork Sat Feb 23 19:34:15 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Kazior X-Patchwork-Id: 2178701 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 728E93FCFC for ; Sat, 23 Feb 2013 19:41:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758649Ab3BWTk4 (ORCPT ); Sat, 23 Feb 2013 14:40:56 -0500 Received: from mail-wg0-f54.google.com ([74.125.82.54]:65302 "EHLO mail-wg0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758602Ab3BWTk4 (ORCPT ); Sat, 23 Feb 2013 14:40:56 -0500 Received: by mail-wg0-f54.google.com with SMTP id fm10so1368326wgb.33 for ; Sat, 23 Feb 2013 11:40:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer; bh=1tMCMyrDCFYsPcr4tuvv/44jK1OWaFtOMfPfHZhqLmQ=; b=nR0QtQSiyOv/u94ligO8hShxwoZtIPbwKM5fj36Moaok9DOSOheuw2HZ6X59fDptGd sQngBfp6ud+gDY0PNUCuyPxAICtyDLLblgOn1mE49bX0vFASxkKMPXs96bbSQ9Z0+9pJ rotDddX7EUE1TjP64+6lzkwJuMPWqC5yPRINQOAex6nSMVEbcOx8inxThOUyVwAWWzeX zVgVYNcXFGGJzXN2NJ7azSyxOAXhLeMdOFFMuML4aGkLD/0tmil4edRenE5atFcOF7rc WnHqpgbcaNRYuzjicPW7pUCkADFmkGnC7wPizp7qV+5Gk6no9gSmKVlfD0pBzOUeI5fr NEBg== X-Received: by 10.180.24.229 with SMTP id x5mr3920338wif.17.1361648454650; Sat, 23 Feb 2013 11:40:54 -0800 (PST) Received: from localhost (dynamic-78-9-3-56.ssp.dialog.net.pl. [78.9.3.56]) by mx.google.com with ESMTPS id cf8sm5890445wib.1.2013.02.23.11.40.45 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sat, 23 Feb 2013 11:40:53 -0800 (PST) From: Michal Kazior To: linux-wireless@vger.kernel.org, "Luis R. Rodriguez" Cc: Michal Kazior Subject: [PATCH] ath: sanitize 0xFFFF regdomain Date: Sat, 23 Feb 2013 20:34:15 +0100 Message-Id: <1361648055-15871-1-git-send-email-kazikcz@gmail.com> X-Mailer: git-send-email 1.7.12.4 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Dbii F52N-PRO mini pci device reports an invalid regdomain. This card has been reported to work on MikroTik's RouterOS but failed on Linux: [ 14.320000] ath: EEPROM regdomain: 0xffff [ 14.320000] ath: EEPROM indicates we should expect a country code [ 14.320000] ath: invalid regulatory domain/country code 0xbfff [ 14.320000] ath: Invalid EEPROM contents [ 14.320000] ath9k 0000:00:12.0: Failed to initialize device [ 14.330000] ath9k: probe of 0000:00:12.0 failed with error -22 With the patch the device works fine. Signed-off-by: Michal Kazior Acked-by: Luis R. Rodriguez --- drivers/net/wireless/ath/regd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/regd.c b/drivers/net/wireless/ath/regd.c index ccc4c71..48fb1b9 100644 --- a/drivers/net/wireless/ath/regd.c +++ b/drivers/net/wireless/ath/regd.c @@ -533,10 +533,11 @@ ath_regd_init_wiphy(struct ath_regulatory *reg, * but since we have more than one user with it we need * a solution for them. We default to 0x64, which is the * default Atheros world regulatory domain. + * There is also at least one report of 0xFFFF being set. */ static void ath_regd_sanitize(struct ath_regulatory *reg) { - if (reg->current_rd != COUNTRY_ERD_FLAG) + if (reg->current_rd != COUNTRY_ERD_FLAG && reg->current_rd != 0xFFFF) return; printk(KERN_DEBUG "ath: EEPROM regdomain sanitized\n"); reg->current_rd = 0x64;