2011-02-21 20:19:47

by Wey-Yi Guy

[permalink] [raw]
Subject: [PATCH wireless-2.6] iwlagn: Support new 5000 microcode.

From: Fry, Donald H <[email protected]>

New iwlwifi-5000 microcode requires driver support for API version 5.

Signed-off-by: Don Fry <[email protected]>
Signed-off-by: Wey-Yi Guy <[email protected]>
CC: [email protected]
---
these patches are also available from wireless-2.6 branch on
git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6.git

drivers/net/wireless/iwlwifi/iwl-5000.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c
index 79ab0a6..537fb8c 100644
--- a/drivers/net/wireless/iwlwifi/iwl-5000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-5000.c
@@ -51,7 +51,7 @@
#include "iwl-agn-debugfs.h"

/* Highest firmware API version supported */
-#define IWL5000_UCODE_API_MAX 2
+#define IWL5000_UCODE_API_MAX 5
#define IWL5150_UCODE_API_MAX 2

/* Lowest firmware API version supported */
--
1.7.0.4



2011-02-21 20:52:37

by Gábor Stefanik

[permalink] [raw]
Subject: Re: [ipw3945-devel] [PATCH wireless-2.6] iwlagn: Support new 5000 microcode.

On Mon, Feb 21, 2011 at 9:05 PM, Wey-Yi Guy <[email protected]> wrote:
> From: Fry, Donald H <[email protected]>
>
> New iwlwifi-5000 microcode requires driver support for API version 5.
>
> Signed-off-by: Don Fry <[email protected]>
> Signed-off-by: Wey-Yi Guy <[email protected]>
> CC: [email protected]
> ---
> these patches are also available from wireless-2.6 branch on
> ?git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6.git
>
> ?drivers/net/wireless/iwlwifi/iwl-5000.c | ? ?2 +-
> ?1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c
> index 79ab0a6..537fb8c 100644
> --- a/drivers/net/wireless/iwlwifi/iwl-5000.c
> +++ b/drivers/net/wireless/iwlwifi/iwl-5000.c
> @@ -51,7 +51,7 @@
> ?#include "iwl-agn-debugfs.h"
>
> ?/* Highest firmware API version supported */
> -#define IWL5000_UCODE_API_MAX 2
> +#define IWL5000_UCODE_API_MAX 5

Where are versions 3 and 4?

> ?#define IWL5150_UCODE_API_MAX 2
>
> ?/* Lowest firmware API version supported */
> --
> 1.7.0.4
>
>
> ------------------------------------------------------------------------------
> Free Software Download:
> Index, Search & Analyze Logs and other IT data in Real-Time with Splunk
> _______________________________________________
> Ipw3945-devel mailing list
> [email protected]
> https://lists.sourceforge.net/lists/listinfo/ipw3945-devel
>



--
Vista: [V]iruses, [I]ntruders, [S]pyware, [T]rojans and [A]dware. :-)

2011-02-21 21:07:34

by Johannes Berg

[permalink] [raw]
Subject: Re: [ipw3945-devel] [PATCH wireless-2.6] iwlagn: Support new 5000 microcode.

On Mon, 2011-02-21 at 21:29 +0100, Gábor Stefanik wrote:
> On Mon, Feb 21, 2011 at 9:05 PM, Wey-Yi Guy <[email protected]> wrote:
> > From: Fry, Donald H <[email protected]>
> >
> > New iwlwifi-5000 microcode requires driver support for API version 5.
> >
> > Signed-off-by: Don Fry <[email protected]>
> > Signed-off-by: Wey-Yi Guy <[email protected]>
> > CC: [email protected]
> > ---
> > these patches are also available from wireless-2.6 branch on
> > git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6.git
> >
> > drivers/net/wireless/iwlwifi/iwl-5000.c | 2 +-
> > 1 files changed, 1 insertions(+), 1 deletions(-)
> >
> > diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c
> > index 79ab0a6..537fb8c 100644
> > --- a/drivers/net/wireless/iwlwifi/iwl-5000.c
> > +++ b/drivers/net/wireless/iwlwifi/iwl-5000.c
> > @@ -51,7 +51,7 @@
> > #include "iwl-agn-debugfs.h"
> >
> > /* Highest firmware API version supported */
> > -#define IWL5000_UCODE_API_MAX 2
> > +#define IWL5000_UCODE_API_MAX 5
>
> Where are versions 3 and 4?

They don't (and won't) exist. We just went to version 5 wholesale to
make it easier to distinguish between the new and old file format -- in
the future new features etc. won't be announced by versions but by TLVs
in the file format (see the code that loads the ucode file from disk)
unless the firmware is completely incompatible.

johannes