Re: [PATCH 6/6] iwlagn: define 130 series of WiFi/BT combo devices

["Guy, Wey-Yi" <wey-yi.w.guy@intel.com>]

Hi Julian,

On Wed, 2010-10-06 at 16:28 -0700, Julian Calaby wrote:
> On Thu, Oct 7, 2010 at 02:23, Wey-Yi Guy <wey-yi.w.guy@intel.com> wrote:
> > add new structures and defines need to identify 130 devices.
> >
> > Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
> > ---
> >  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.....)
> 
Good catch, you are correct. I will push another patch to fix it.

Thanks
Wey