From patchwork Tue Sep 11 01:30:46 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bing Zhao X-Patchwork-Id: 1434751 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id A8267DF28C for ; Tue, 11 Sep 2012 01:32:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757174Ab2IKBcE (ORCPT ); Mon, 10 Sep 2012 21:32:04 -0400 Received: from na3sys009aog129.obsmtp.com ([74.125.149.142]:37892 "EHLO na3sys009aog129.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756958Ab2IKBcC (ORCPT ); Mon, 10 Sep 2012 21:32:02 -0400 Received: from MSI-MTA.marvell.com ([65.219.4.132]) (using TLSv1) by na3sys009aob129.postini.com ([74.125.148.12]) with SMTP ID DSNKUE6UkNSphEThiJsjjjyfZA9PN094XsD+@postini.com; Mon, 10 Sep 2012 18:32:02 PDT Received: from maili.marvell.com ([10.68.76.210]) by MSI-MTA.marvell.com with Microsoft SMTPSVC(6.0.3790.3959); Mon, 10 Sep 2012 18:30:51 -0700 Received: from localhost.localdomain (unknown [10.80.114.125]) by maili.marvell.com (Postfix) with ESMTP id 264714E510; Mon, 10 Sep 2012 18:30:52 -0700 (PDT) From: Bing Zhao To: linux-wireless@vger.kernel.org Cc: "John W. Linville" , Amitkumar Karwar , Kiran Divekar , Avinash Patil , Yogesh Powar , Stone Piao , Ying Luo , Frank Huang , Bing Zhao Subject: [PATCH 07/10] mwifiex: do not hint regulatory domain with f/w country code Date: Mon, 10 Sep 2012 18:30:46 -0700 Message-Id: <1347327049-13665-8-git-send-email-bzhao@marvell.com> X-Mailer: git-send-email 1.7.0.2 In-Reply-To: <1347327049-13665-1-git-send-email-bzhao@marvell.com> References: <1347327049-13665-1-git-send-email-bzhao@marvell.com> X-OriginalArrivalTime: 11 Sep 2012 01:30:51.0908 (UTC) FILETIME=[147F2440:01CD8FBD] Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org We will use world regulatory domain (country 00) as default when driver is loaded. Later after a successful association cfg80211 will change the regulatory domain to a specific country if the AP has advertised country IE. Signed-off-by: Bing Zhao Signed-off-by: Amitkumar Karwar --- drivers/net/wireless/mwifiex/cfg80211.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c index 3a27554..797f978 100644 --- a/drivers/net/wireless/mwifiex/cfg80211.c +++ b/drivers/net/wireless/mwifiex/cfg80211.c @@ -1862,8 +1862,9 @@ int mwifiex_register_cfg80211(struct mwifiex_adapter *adapter) return ret; } country_code = mwifiex_11d_code_2_region(priv->adapter->region_code); - if (country_code && regulatory_hint(wiphy, country_code)) - dev_err(adapter->dev, "regulatory_hint() failed\n"); + if (country_code) + dev_info(adapter->dev, + "ignoring F/W country code %2.2s\n", country_code); adapter->wiphy = wiphy; return ret;