* Re: linux-next: Tree for March 24 (iwlwifi)
[not found] <20100324161746.85edc5a3.sfr@canb.auug.org.au>
@ 2010-03-24 20:19 ` Randy Dunlap
2010-03-24 21:23 ` [PATCH] iwlwifi: fix build error for CONFIG_IWLAGN=n John W. Linville
0 siblings, 1 reply; 9+ messages in thread
From: Randy Dunlap @ 2010-03-24 20:19 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML, linux-wireless
On 03/23/10 22:17, Stephen Rothwell wrote:
> Hi all,
>
> Changes since 20100323:
drivers/net/wireless/iwlwifi/iwl-rx.c: In function 'iwl_good_ack_health':
drivers/net/wireless/iwlwifi/iwl-rx.c:647: error: 'struct iwl_priv' has no member named '_agn'
when CONFIG_IWLAGN is not enabled.
--
~Randy
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH] iwlwifi: fix build error for CONFIG_IWLAGN=n
2010-03-24 20:19 ` linux-next: Tree for March 24 (iwlwifi) Randy Dunlap
@ 2010-03-24 21:23 ` John W. Linville
2010-03-24 21:33 ` Johannes Berg
2010-03-24 22:59 ` Randy Dunlap
0 siblings, 2 replies; 9+ messages in thread
From: John W. Linville @ 2010-03-24 21:23 UTC (permalink / raw)
To: linux-wireless; +Cc: linux-next, John W. Linville
drivers/net/wireless/iwlwifi/iwl-rx.c: In function 'iwl_good_ack_health':
drivers/net/wireless/iwlwifi/iwl-rx.c:647: error: 'struct iwl_priv' has no member named '_agn'
Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---
drivers/net/wireless/iwlwifi/iwl-rx.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/drivers/net/wireless/iwlwifi/iwl-rx.c b/drivers/net/wireless/iwlwifi/iwl-rx.c
index b6a64d8..2fa30df 100644
--- a/drivers/net/wireless/iwlwifi/iwl-rx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-rx.c
@@ -621,6 +621,7 @@ static void iwl_accumulative_statistics(struct iwl_priv *priv,
#define BA_TIMEOUT_CNT (5)
#define BA_TIMEOUT_MAX (16)
+#if defined(CONFIG_IWLAGN) || defined(CONFIG_IWLAGN_MODULE)
/**
* iwl_good_ack_health - checks for ACK count ratios, BA timeout retries.
*
@@ -670,6 +671,7 @@ bool iwl_good_ack_health(struct iwl_priv *priv,
return rc;
}
EXPORT_SYMBOL(iwl_good_ack_health);
+#endif
/**
* iwl_good_plcp_health - checks for plcp error.
--
1.6.2.5
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH] iwlwifi: fix build error for CONFIG_IWLAGN=n
2010-03-24 21:23 ` [PATCH] iwlwifi: fix build error for CONFIG_IWLAGN=n John W. Linville
@ 2010-03-24 21:33 ` Johannes Berg
2010-03-24 21:42 ` reinette chatre
2010-03-24 22:59 ` Randy Dunlap
1 sibling, 1 reply; 9+ messages in thread
From: Johannes Berg @ 2010-03-24 21:33 UTC (permalink / raw)
To: John W. Linville; +Cc: linux-wireless, linux-next, Reinette Chatre
On Wed, 2010-03-24 at 17:23 -0400, John W. Linville wrote:
> drivers/net/wireless/iwlwifi/iwl-rx.c: In function 'iwl_good_ack_health':
> drivers/net/wireless/iwlwifi/iwl-rx.c:647: error: 'struct iwl_priv' has no member named '_agn'
>
> Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
> Signed-off-by: John W. Linville <linville@tuxdriver.com>
> ---
> drivers/net/wireless/iwlwifi/iwl-rx.c | 2 ++
> 1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/net/wireless/iwlwifi/iwl-rx.c b/drivers/net/wireless/iwlwifi/iwl-rx.c
> index b6a64d8..2fa30df 100644
> --- a/drivers/net/wireless/iwlwifi/iwl-rx.c
> +++ b/drivers/net/wireless/iwlwifi/iwl-rx.c
> @@ -621,6 +621,7 @@ static void iwl_accumulative_statistics(struct iwl_priv *priv,
> #define BA_TIMEOUT_CNT (5)
> #define BA_TIMEOUT_MAX (16)
>
> +#if defined(CONFIG_IWLAGN) || defined(CONFIG_IWLAGN_MODULE)
> /**
> * iwl_good_ack_health - checks for ACK count ratios, BA timeout
> retries.
I thought we had a patch moving it?
johannes
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] iwlwifi: fix build error for CONFIG_IWLAGN=n
2010-03-24 21:33 ` Johannes Berg
@ 2010-03-24 21:42 ` reinette chatre
2010-03-24 22:37 ` John W. Linville
0 siblings, 1 reply; 9+ messages in thread
From: reinette chatre @ 2010-03-24 21:42 UTC (permalink / raw)
To: Johannes Berg; +Cc: John W. Linville, linux-wireless, linux-next
On Wed, 2010-03-24 at 14:33 -0700, Johannes Berg wrote:
> On Wed, 2010-03-24 at 17:23 -0400, John W. Linville wrote:
> > drivers/net/wireless/iwlwifi/iwl-rx.c: In function 'iwl_good_ack_health':
> > drivers/net/wireless/iwlwifi/iwl-rx.c:647: error: 'struct iwl_priv' has no member named '_agn'
> >
> > Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
> > Signed-off-by: John W. Linville <linville@tuxdriver.com>
> > ---
> > drivers/net/wireless/iwlwifi/iwl-rx.c | 2 ++
> > 1 files changed, 2 insertions(+), 0 deletions(-)
> >
> > diff --git a/drivers/net/wireless/iwlwifi/iwl-rx.c b/drivers/net/wireless/iwlwifi/iwl-rx.c
> > index b6a64d8..2fa30df 100644
> > --- a/drivers/net/wireless/iwlwifi/iwl-rx.c
> > +++ b/drivers/net/wireless/iwlwifi/iwl-rx.c
> > @@ -621,6 +621,7 @@ static void iwl_accumulative_statistics(struct iwl_priv *priv,
> > #define BA_TIMEOUT_CNT (5)
> > #define BA_TIMEOUT_MAX (16)
> >
> > +#if defined(CONFIG_IWLAGN) || defined(CONFIG_IWLAGN_MODULE)
> > /**
> > * iwl_good_ack_health - checks for ACK count ratios, BA timeout
> > retries.
>
> I thought we had a patch moving it?
>
We do, but it has not been pushed upstream yet.
John, I'd prefer
http://viggo.jf.intel.com/~wifi/repos.git/?p=iwlwifi-2.6.git;a=commit;h=bc745eb7d28285f3b437c00253bf01ef501eb3f1
Should we push it upstream asap or can it wait until our next series
goes out after all our validation cycles pass?
Reinette
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] iwlwifi: fix build error for CONFIG_IWLAGN=n
2010-03-24 21:42 ` reinette chatre
@ 2010-03-24 22:37 ` John W. Linville
2010-03-24 22:41 ` reinette chatre
0 siblings, 1 reply; 9+ messages in thread
From: John W. Linville @ 2010-03-24 22:37 UTC (permalink / raw)
To: reinette chatre; +Cc: Johannes Berg, linux-wireless, linux-next
On Wed, Mar 24, 2010 at 02:42:28PM -0700, reinette chatre wrote:
> On Wed, 2010-03-24 at 14:33 -0700, Johannes Berg wrote:
> > On Wed, 2010-03-24 at 17:23 -0400, John W. Linville wrote:
> > > drivers/net/wireless/iwlwifi/iwl-rx.c: In function 'iwl_good_ack_health':
> > > drivers/net/wireless/iwlwifi/iwl-rx.c:647: error: 'struct iwl_priv' has no member named '_agn'
> > >
> > > Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
> > > Signed-off-by: John W. Linville <linville@tuxdriver.com>
> > > ---
> > > drivers/net/wireless/iwlwifi/iwl-rx.c | 2 ++
> > > 1 files changed, 2 insertions(+), 0 deletions(-)
> > >
> > > diff --git a/drivers/net/wireless/iwlwifi/iwl-rx.c b/drivers/net/wireless/iwlwifi/iwl-rx.c
> > > index b6a64d8..2fa30df 100644
> > > --- a/drivers/net/wireless/iwlwifi/iwl-rx.c
> > > +++ b/drivers/net/wireless/iwlwifi/iwl-rx.c
> > > @@ -621,6 +621,7 @@ static void iwl_accumulative_statistics(struct iwl_priv *priv,
> > > #define BA_TIMEOUT_CNT (5)
> > > #define BA_TIMEOUT_MAX (16)
> > >
> > > +#if defined(CONFIG_IWLAGN) || defined(CONFIG_IWLAGN_MODULE)
> > > /**
> > > * iwl_good_ack_health - checks for ACK count ratios, BA timeout
> > > retries.
> >
> > I thought we had a patch moving it?
> >
>
> We do, but it has not been pushed upstream yet.
>
> John, I'd prefer
> http://viggo.jf.intel.com/~wifi/repos.git/?p=iwlwifi-2.6.git;a=commit;h=bc745eb7d28285f3b437c00253bf01ef501eb3f1
>
> Should we push it upstream asap or can it wait until our next series
> goes out after all our validation cycles pass?
I can't see that link. How does the patch differ?
John
--
John W. Linville Someday the world will need a hero, and you
linville@tuxdriver.com might be all we have. Be ready.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] iwlwifi: fix build error for CONFIG_IWLAGN=n
2010-03-24 22:37 ` John W. Linville
@ 2010-03-24 22:41 ` reinette chatre
2010-03-24 23:38 ` John W. Linville
0 siblings, 1 reply; 9+ messages in thread
From: reinette chatre @ 2010-03-24 22:41 UTC (permalink / raw)
To: John W. Linville; +Cc: Johannes Berg, linux-wireless, linux-next
On Wed, 2010-03-24 at 15:37 -0700, John W. Linville wrote:
> On Wed, Mar 24, 2010 at 02:42:28PM -0700, reinette chatre wrote:
> > On Wed, 2010-03-24 at 14:33 -0700, Johannes Berg wrote:
> > > On Wed, 2010-03-24 at 17:23 -0400, John W. Linville wrote:
> > > > drivers/net/wireless/iwlwifi/iwl-rx.c: In function 'iwl_good_ack_health':
> > > > drivers/net/wireless/iwlwifi/iwl-rx.c:647: error: 'struct iwl_priv' has no member named '_agn'
> > > >
> > > > Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
> > > > Signed-off-by: John W. Linville <linville@tuxdriver.com>
> > > > ---
> > > > drivers/net/wireless/iwlwifi/iwl-rx.c | 2 ++
> > > > 1 files changed, 2 insertions(+), 0 deletions(-)
> > > >
> > > > diff --git a/drivers/net/wireless/iwlwifi/iwl-rx.c b/drivers/net/wireless/iwlwifi/iwl-rx.c
> > > > index b6a64d8..2fa30df 100644
> > > > --- a/drivers/net/wireless/iwlwifi/iwl-rx.c
> > > > +++ b/drivers/net/wireless/iwlwifi/iwl-rx.c
> > > > @@ -621,6 +621,7 @@ static void iwl_accumulative_statistics(struct iwl_priv *priv,
> > > > #define BA_TIMEOUT_CNT (5)
> > > > #define BA_TIMEOUT_MAX (16)
> > > >
> > > > +#if defined(CONFIG_IWLAGN) || defined(CONFIG_IWLAGN_MODULE)
> > > > /**
> > > > * iwl_good_ack_health - checks for ACK count ratios, BA timeout
> > > > retries.
> > >
> > > I thought we had a patch moving it?
> > >
> >
> > We do, but it has not been pushed upstream yet.
> >
> > John, I'd prefer
> > http://viggo.jf.intel.com/~wifi/repos.git/?p=iwlwifi-2.6.git;a=commit;h=bc745eb7d28285f3b437c00253bf01ef501eb3f1
> >
> > Should we push it upstream asap or can it wait until our next series
> > goes out after all our validation cycles pass?
>
> I can't see that link. How does the patch differ?
I am very sorry, here is the correct link:
http://git.kernel.org/?p=linux/kernel/git/iwlwifi/iwlwifi-2.6.git;a=commit;h=bc745eb7d28285f3b437c00253bf01ef501eb3f1
Reinette
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] iwlwifi: fix build error for CONFIG_IWLAGN=n
2010-03-24 21:23 ` [PATCH] iwlwifi: fix build error for CONFIG_IWLAGN=n John W. Linville
2010-03-24 21:33 ` Johannes Berg
@ 2010-03-24 22:59 ` Randy Dunlap
1 sibling, 0 replies; 9+ messages in thread
From: Randy Dunlap @ 2010-03-24 22:59 UTC (permalink / raw)
To: John W. Linville; +Cc: linux-wireless, linux-next
On 03/24/10 14:23, John W. Linville wrote:
> drivers/net/wireless/iwlwifi/iwl-rx.c: In function 'iwl_good_ack_health':
> drivers/net/wireless/iwlwifi/iwl-rx.c:647: error: 'struct iwl_priv' has no member named '_agn'
>
> Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
> Signed-off-by: John W. Linville <linville@tuxdriver.com>
ACK if you end up using this one.
Thanks.
> ---
> drivers/net/wireless/iwlwifi/iwl-rx.c | 2 ++
> 1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/net/wireless/iwlwifi/iwl-rx.c b/drivers/net/wireless/iwlwifi/iwl-rx.c
> index b6a64d8..2fa30df 100644
> --- a/drivers/net/wireless/iwlwifi/iwl-rx.c
> +++ b/drivers/net/wireless/iwlwifi/iwl-rx.c
> @@ -621,6 +621,7 @@ static void iwl_accumulative_statistics(struct iwl_priv *priv,
> #define BA_TIMEOUT_CNT (5)
> #define BA_TIMEOUT_MAX (16)
>
> +#if defined(CONFIG_IWLAGN) || defined(CONFIG_IWLAGN_MODULE)
> /**
> * iwl_good_ack_health - checks for ACK count ratios, BA timeout retries.
> *
> @@ -670,6 +671,7 @@ bool iwl_good_ack_health(struct iwl_priv *priv,
> return rc;
> }
> EXPORT_SYMBOL(iwl_good_ack_health);
> +#endif
>
> /**
> * iwl_good_plcp_health - checks for plcp error.
--
~Randy
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] iwlwifi: fix build error for CONFIG_IWLAGN=n
2010-03-24 22:41 ` reinette chatre
@ 2010-03-24 23:38 ` John W. Linville
2010-03-25 16:33 ` reinette chatre
0 siblings, 1 reply; 9+ messages in thread
From: John W. Linville @ 2010-03-24 23:38 UTC (permalink / raw)
To: reinette chatre; +Cc: Johannes Berg, linux-wireless, linux-next
On Wed, Mar 24, 2010 at 03:41:29PM -0700, reinette chatre wrote:
> I am very sorry, here is the correct link:
> http://git.kernel.org/?p=linux/kernel/git/iwlwifi/iwlwifi-2.6.git;a=commit;h=bc745eb7d28285f3b437c00253bf01ef501eb3f1
FWIW, that one misses the definition of iwl_good_ack_health in iwl-core.h.
I already put the other one in wireless-next-2.6. I'll just resolve
the conflict when I pull your tree.
Thanks,
John
--
John W. Linville Someday the world will need a hero, and you
linville@tuxdriver.com might be all we have. Be ready.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] iwlwifi: fix build error for CONFIG_IWLAGN=n
2010-03-24 23:38 ` John W. Linville
@ 2010-03-25 16:33 ` reinette chatre
0 siblings, 0 replies; 9+ messages in thread
From: reinette chatre @ 2010-03-25 16:33 UTC (permalink / raw)
To: John W. Linville; +Cc: Johannes Berg, linux-wireless, linux-next
Hi John,
On Wed, 2010-03-24 at 16:38 -0700, John W. Linville wrote:
> On Wed, Mar 24, 2010 at 03:41:29PM -0700, reinette chatre wrote:
>
> > I am very sorry, here is the correct link:
> > http://git.kernel.org/?p=linux/kernel/git/iwlwifi/iwlwifi-2.6.git;a=commit;h=bc745eb7d28285f3b437c00253bf01ef501eb3f1
>
> FWIW, that one misses the definition of iwl_good_ack_health in iwl-core.h.
This definition was added in an recent patch "iwlwifi: code cleanup for
connectivity recovery" which is already in wireless-next-2.6.
> I already put the other one in wireless-next-2.6. I'll just resolve
> the conflict when I pull your tree.
I'll try to sort this out with our next submission so that there are no
conflicts to resolve.
Reinette
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2010-03-25 16:33 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <20100324161746.85edc5a3.sfr@canb.auug.org.au>
2010-03-24 20:19 ` linux-next: Tree for March 24 (iwlwifi) Randy Dunlap
2010-03-24 21:23 ` [PATCH] iwlwifi: fix build error for CONFIG_IWLAGN=n John W. Linville
2010-03-24 21:33 ` Johannes Berg
2010-03-24 21:42 ` reinette chatre
2010-03-24 22:37 ` John W. Linville
2010-03-24 22:41 ` reinette chatre
2010-03-24 23:38 ` John W. Linville
2010-03-25 16:33 ` reinette chatre
2010-03-24 22:59 ` Randy Dunlap
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).