Return-path: Received: from mail-iw0-f174.google.com ([209.85.214.174]:59768 "EHLO mail-iw0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753277Ab0JFX24 convert rfc822-to-8bit (ORCPT ); Wed, 6 Oct 2010 19:28:56 -0400 Received: by iwn9 with SMTP id 9so25292iwn.19 for ; Wed, 06 Oct 2010 16:28:56 -0700 (PDT) MIME-Version: 1.0 In-Reply-To: <1286378593-7509-7-git-send-email-wey-yi.w.guy@intel.com> References: <1286378593-7509-1-git-send-email-wey-yi.w.guy@intel.com> <1286378593-7509-7-git-send-email-wey-yi.w.guy@intel.com> From: Julian Calaby Date: Thu, 7 Oct 2010 10:28:34 +1100 Message-ID: Subject: Re: [PATCH 6/6] iwlagn: define 130 series of WiFi/BT combo devices To: Wey-Yi Guy Cc: linville@tuxdriver.com, linux-wireless@vger.kernel.org, ipw3945-devel@lists.sourceforge.net Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-wireless-owner@vger.kernel.org List-ID: On Thu, Oct 7, 2010 at 02:23, Wey-Yi Guy wrote: > add new structures and defines need to identify 130 devices. > > Signed-off-by: Wey-Yi Guy > --- > ?drivers/net/wireless/iwlwifi/iwl-6000.c | ? 44 +++++++++++++++++++++++++++++++ > ?drivers/net/wireless/iwlwifi/iwl-agn.c ?| ? 10 +++++++ > ?drivers/net/wireless/iwlwifi/iwl-agn.h ?| ? ?2 + > ?3 files changed, 56 insertions(+), 0 deletions(-) > > diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c > index 5866ad8..43ec898 100644 > --- a/drivers/net/wireless/iwlwifi/iwl-6000.c > +++ b/drivers/net/wireless/iwlwifi/iwl-6000.c > @@ -75,6 +77,9 @@ > ?#define _IWL6000G2B_MODULE_FIRMWARE(api) IWL6000G2B_FW_PRE #api ".ucode" > ?#define IWL6000G2B_MODULE_FIRMWARE(api) _IWL6000G2B_MODULE_FIRMWARE(api) > > +#define IWL130_FW_PRE "iwlwifi-130-" > +#define _IWL100_MODULE_FIRMWARE(api) IWL130_FW_PRE #api ".ucode" > +#define IWL100_MODULE_FIRMWARE(api) _IWL130_MODULE_FIRMWARE(api) I haven't looked at the rest of the file, but is this correct: you're defining IWL100_MODULE_FIRMWARE using the IWL1*3*0 definitions, which don't seem to be defined. (I note that these definitions aren't used, but still.....) Thanks, -- Julian Calaby Email: julian.calaby@gmail.com Profile: http://www.google.com/profiles/julian.calaby/ .Plan: http://sites.google.com/site/juliancalaby/