* Re: linux-next: Tree for June 3 (iwlwifi)
2010-06-03 17:21 ` John W. Linville
@ 2010-06-03 17:42 ` Guy, Wey-Yi
2010-06-03 17:45 ` reinette chatre
1 sibling, 0 replies; 4+ messages in thread
From: Guy, Wey-Yi @ 2010-06-03 17:42 UTC (permalink / raw)
To: John W. Linville
Cc: Randy Dunlap, Stephen Rothwell, linux-wireless@vger.kernel.org,
linux-next@vger.kernel.org, LKML, Chatre, Reinette
Hi John,
On Thu, 2010-06-03 at 10:21 -0700, John W. Linville wrote:
> 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@intel.com>
> 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@intel.com>
> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
>
> Since iwl-rx.o is part of iwlcore.ko, this change seems wrong.
> Reinette, any reason why I shouldn't just revert it?
>
Sorry for the mistake, please revert it and I will fix the issue and
re-submit.
Thanks
Wey
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: Tree for June 3 (iwlwifi)
2010-06-03 17:21 ` John W. Linville
2010-06-03 17:42 ` Guy, Wey-Yi
@ 2010-06-03 17:45 ` reinette chatre
1 sibling, 0 replies; 4+ messages in thread
From: reinette chatre @ 2010-06-03 17:45 UTC (permalink / raw)
To: John W. Linville
Cc: Randy Dunlap, Stephen Rothwell, linux-wireless@vger.kernel.org,
linux-next@vger.kernel.org, LKML, Guy, Wey-Yi W
Hi John,
On Thu, 2010-06-03 at 10:21 -0700, John W. Linville wrote:
> 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@intel.com>
> 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@intel.com>
> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
>
> Since iwl-rx.o is part of iwlcore.ko, this change seems wrong.
Indeed. Sorry about this.
> Reinette, any reason why I shouldn't just revert it?
No - please do revert it. I am getting an unfamiliar error when I tried
to revert it from linux-2.6 as well as wireless-testing, but perhaps it
is something your are familiar with. Please let me know if you need a
patch that will take care of the revert.
Reinette
^ permalink raw reply [flat|nested] 4+ messages in thread