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
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 <[email protected]>
> > > Signed-off-by: John W. Linville <[email protected]>
> > > ---
> > > 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
[email protected] ? ? ? ? ? ? ? ? ?might be all we have. ?Be ready.
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 <[email protected]>
> > Signed-off-by: John W. Linville <[email protected]>
> > ---
> > 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
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
[email protected] ? ? ? ? ? ? ? ? ?might be all we have. ?Be ready.
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
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 <[email protected]>
> > > > Signed-off-by: John W. Linville <[email protected]>
> > > > ---
> > > > 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
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 <[email protected]>
> Signed-off-by: John W. Linville <[email protected]>
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
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 <[email protected]>
> Signed-off-by: John W. Linville <[email protected]>
> ---
> 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
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 <[email protected]>
Signed-off-by: John W. Linville <[email protected]>
---
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