[patch 2.6.35] WiMAX pull request

[patch 2.6.35] WiMAX pull request

[Inaky Perez-Gonzalez]

From: Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>

The following changes since commit 0fb0a4f00aaf5de9f328273d7a46e3aa27dab496:
  Inaky Perez-Gonzalez (1):
        wimax/i2400m: driver defaults to firmware v1.5 for i6x60 devices

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/inaky/wimax.git wimax-2.6.35.y

Patches follow for reviewing convenience.

Inaky Perez-Gonzalez (1):
      wimax/i2400m: fix bad race condition check in RX path

 drivers/net/wimax/i2400m/rx.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Re: [patch 2.6.35] WiMAX pull request

[David Miller]

From: Inaky Perez-Gonzalez <inaky@linux.intel.com>
Date: Tue, 25 May 2010 10:45:12 -0700

> The following changes since commit 0fb0a4f00aaf5de9f328273d7a46e3aa27dab496:
>   Inaky Perez-Gonzalez (1):
>         wimax/i2400m: driver defaults to firmware v1.5 for i6x60 devices
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/inaky/wimax.git wimax-2.6.35.y
> 
> Patches follow for reviewing convenience.

Pulled, thank you.

[patch 2.6.35] WiMAX pull request

[Inaky Perez-Gonzalez]

From: Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>

The following changes since commit 3a24934f065d23145f1c9c70da9f630c7a37795f:
  Inaky Perez-Gonzalez (1):
        wimax/i2400m: fix bad race condition check in RX path

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/inaky/wimax.git wimax-2.6.35.y

Patches follow for reviewing convenience.

Inaky Perez-Gonzalez (1):
      wimax/i2400m: fix missing endian correction read in fw loader

 drivers/net/wimax/i2400m/fw.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

[patch 2.6.35] wimax/i2400m: fix missing endian correction read in fw loader

[Inaky Perez-Gonzalez]

From: Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>

i2400m_fw_hdr_check() was accessing hardware field
bcf_hdr->module_type (little endian 32) without converting to host
byte sex.

Reported-by: Данилин Михаил <mdanilin@nsg.net.ru>

Signed-off-by: Inaky Perez-Gonzalez <inaky@linux.intel.com>
---
 drivers/net/wimax/i2400m/fw.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/wimax/i2400m/fw.c b/drivers/net/wimax/i2400m/fw.c
index 3f283bf..1149135 100644
--- a/drivers/net/wimax/i2400m/fw.c
+++ b/drivers/net/wimax/i2400m/fw.c
@@ -1192,7 +1192,7 @@ int i2400m_fw_hdr_check(struct i2400m *i2400m,
 	unsigned module_type, header_len, major_version, minor_version,
 		module_id, module_vendor, date, size;
 
-	module_type = bcf_hdr->module_type;
+	module_type = le32_to_cpu(bcf_hdr->module_type);
 	header_len = sizeof(u32) * le32_to_cpu(bcf_hdr->header_len);
 	major_version = (le32_to_cpu(bcf_hdr->header_version) & 0xffff0000)
 		>> 16;
-- 
1.6.6.1

_______________________________________________
wimax mailing list
wimax@linuxwimax.org
http://lists.linuxwimax.org/listinfo/wimax

Re: [patch 2.6.35] WiMAX pull request

[David Miller]

From: Inaky Perez-Gonzalez <inaky@linux.intel.com>
Date: Fri, 11 Jun 2010 12:03:05 -0700

> From: Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>
> 
> The following changes since commit 3a24934f065d23145f1c9c70da9f630c7a37795f:
>   Inaky Perez-Gonzalez (1):
>         wimax/i2400m: fix bad race condition check in RX path
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/inaky/wimax.git wimax-2.6.35.y

Pulled, thanks a lot.

[patch 2.6.35] WiMAX pull request

[Inaky Perez-Gonzalez]

From: Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>

Hello David

This is a simple patch to add the USB IDs for another SKU of the Intel
6250. I understand that it might be too late to get it into 2.6.35,
but I'd like to ask if it is possible.

Thank you,

The following changes since commit a385a53e659b35ebee604889e21c40e5c336941f:
  Inaky Perez-Gonzalez (1):
        wimax/i2400m: fix missing endian correction read in fw loader

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/inaky/wimax.git wimax-2.6.35.y

Patches follow for reviewing convenience.

Alexey Shvetsov (1):
      wimax/i2400m: Add PID & VID for Intel WiMAX 6250

 drivers/net/wimax/i2400m/i2400m-usb.h |    1 +
 drivers/net/wimax/i2400m/usb.c        |    2 ++
 2 files changed, 3 insertions(+), 0 deletions(-)

Re: [patch 2.6.35] WiMAX pull request

[David Miller]

From: Inaky Perez-Gonzalez <inaky@linux.intel.com>
Date: Thu, 22 Jul 2010 17:15:13 -0700

> The following changes since commit a385a53e659b35ebee604889e21c40e5c336941f:
>   Inaky Perez-Gonzalez (1):
>         wimax/i2400m: fix missing endian correction read in fw loader
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/inaky/wimax.git wimax-2.6.35.y
> 
> Patches follow for reviewing convenience.
> 
> Alexey Shvetsov (1):
>       wimax/i2400m: Add PID & VID for Intel WiMAX 6250

Pulled, thanks.