From patchwork Thu Dec 3 10:40:18 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Ortiz X-Patchwork-Id: 64484 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nB3Adu69027462 for ; Thu, 3 Dec 2009 10:39:56 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755942AbZLCKji (ORCPT ); Thu, 3 Dec 2009 05:39:38 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755941AbZLCKji (ORCPT ); Thu, 3 Dec 2009 05:39:38 -0500 Received: from mga07.intel.com ([143.182.124.22]:12472 "EHLO azsmga101.ch.intel.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755927AbZLCKjh (ORCPT ); Thu, 3 Dec 2009 05:39:37 -0500 Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga101.ch.intel.com with ESMTP; 03 Dec 2009 02:39:44 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.47,316,1257148800"; d="scan'208";a="218346221" Received: from unknown (HELO sortiz-mobl) ([10.255.16.219]) by azsmga001.ch.intel.com with ESMTP; 03 Dec 2009 02:39:42 -0800 From: Samuel Ortiz To: John Linville Cc: linux-wireless@vger.kernel.org, Zhu Yi , Samuel Ortiz Subject: [PATCH 4/4] iwmc3200wifi: Enable wimax core through module parameter Date: Thu, 3 Dec 2009 11:40:18 +0100 Message-Id: <5254f26fc43d0932cb2b27c0fbccda53e3093ced.1259835655.git.sameo@linux.intel.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: References: <4790a128344a09f0bdb2249c8ee831f254ca72ec.1259835655.git.sameo@linux.intel.com> <3259e3798cc114c1d6da7e764ce9da739b4e88b4.1259835655.git.sameo@linux.intel.com> In-Reply-To: References: Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org diff --git a/drivers/net/wireless/iwmc3200wifi/main.c b/drivers/net/wireless/iwmc3200wifi/main.c index 0ffb041..7f34d6d 100644 --- a/drivers/net/wireless/iwmc3200wifi/main.c +++ b/drivers/net/wireless/iwmc3200wifi/main.c @@ -68,7 +68,6 @@ static struct iwm_conf def_iwm_conf = { .ct_kill_exit = 110, .reset_on_fatal_err = 1, .auto_connect = 1, - .wimax_not_present = 0, .enable_qos = 1, .mode = UMAC_MODE_BSS, @@ -94,6 +93,10 @@ static int modparam_reset; module_param_named(reset, modparam_reset, bool, 0644); MODULE_PARM_DESC(reset, "reset on firmware errors (default 0 [not reset])"); +static int modparam_wimax_enable = 1; +module_param_named(wimax_enable, modparam_wimax_enable, bool, 0644); +MODULE_PARM_DESC(wimax_enable, "Enable wimax core (default 1 [wimax enabled])"); + int iwm_mode_to_nl80211_iftype(int mode) { switch (mode) { @@ -486,7 +489,7 @@ static int iwm_config_boot_params(struct iwm_priv *iwm) int ret; /* check Wimax is off and config debug monitor */ - if (iwm->conf.wimax_not_present) { + if (!modparam_wimax_enable) { u32 data1 = 0x1f; u32 addr1 = 0x606BE258;