Re: linux-next: Tree for June 3 (iwlwifi)

[John W. Linville]

On Thu, Jun 03, 2010 at 08:55:01AM -0700, Randy Dunlap wrote:
> On Thu, 3 Jun 2010 13:47:53 +1000 Stephen Rothwell wrote:
> 
> > Hi all,
> > 
> > Changes since 20100602:
> 
> 
> when CONFIG_IWLAGN=n:
> 
> drivers/net/wireless/iwlwifi/iwl-rx.c:254: error: 'struct iwl_priv' has no member named '_agn'
> drivers/net/wireless/iwlwifi/iwl-rx.c:303: error: 'struct iwl_priv' has no member named '_agn'
> drivers/net/wireless/iwlwifi/iwl-rx.c:304: error: 'struct iwl_priv' has no member named '_agn'
> drivers/net/wireless/iwlwifi/iwl-rx.c:305: error: 'struct iwl_priv' has no member named '_agn'
> drivers/net/wireless/iwlwifi/iwl-rx.c:306: error: 'struct iwl_priv' has no member named '_agn'
> 
> and many more.
> 
> Haven't we seen this movie before?

Ugh...caused be this:

commit a2064b7a4a22d118087898e4308670da7ac07911
Author: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Date:   Fri Apr 30 14:21:48 2010 -0700

    iwlwifi: move _agn statistics related structure
    
    agn and 3945 has different statistics_notif data structure; since 3945
    has it statistics_notif data structure inside the _3945 portion of
    iwl_priv, it make sense to move the agn statistics_notif into _agn portion.
    
    Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
    Signed-off-by: Reinette Chatre <reinette.chatre@xxxxxxxxx>

Since iwl-rx.o is part of iwlcore.ko, this change seems wrong.
Reinette, any reason why I shouldn't just revert it?

John
-- 
John W. Linville		Someday the world will need a hero, and you
linville@xxxxxxxxxxxxx			might be all we have.  Be ready.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/