[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(-)

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(-)

[patch 2.6.35] wimax/i2400m: Add PID & VID for Intel WiMAX 6250

[Inaky Perez-Gonzalez]

From: Alexey Shvetsov <alexxy@gentoo.org>

This version of intel wimax device was found in my IBM ThinkPad x201

Signed-off-by: Alexey Shvetsov <alexxy@gentoo.org>
---
 drivers/net/wimax/i2400m/i2400m-usb.h |    1 +
 drivers/net/wimax/i2400m/usb.c        |    2 ++
 2 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/drivers/net/wimax/i2400m/i2400m-usb.h b/drivers/net/wimax/i2400m/i2400m-usb.h
index 2d7c96d..eb80243 100644
--- a/drivers/net/wimax/i2400m/i2400m-usb.h
+++ b/drivers/net/wimax/i2400m/i2400m-usb.h
@@ -152,6 +152,7 @@ enum {
 	/* Device IDs */
 	USB_DEVICE_ID_I6050 = 0x0186,
 	USB_DEVICE_ID_I6050_2 = 0x0188,
+	USB_DEVICE_ID_I6250 = 0x0187,
 };
 
 
diff --git a/drivers/net/wimax/i2400m/usb.c b/drivers/net/wimax/i2400m/usb.c
index 16341ff..0f88702 100644
--- a/drivers/net/wimax/i2400m/usb.c
+++ b/drivers/net/wimax/i2400m/usb.c
@@ -491,6 +491,7 @@ int i2400mu_probe(struct usb_interface *iface,
 	switch (id->idProduct) {
 	case USB_DEVICE_ID_I6050:
 	case USB_DEVICE_ID_I6050_2:
+	case USB_DEVICE_ID_I6250:
 		i2400mu->i6050 = 1;
 		break;
 	default:
@@ -739,6 +740,7 @@ static
 struct usb_device_id i2400mu_id_table[] = {
 	{ USB_DEVICE(0x8086, USB_DEVICE_ID_I6050) },
 	{ USB_DEVICE(0x8086, USB_DEVICE_ID_I6050_2) },
+	{ USB_DEVICE(0x8086, USB_DEVICE_ID_I6250) },
 	{ USB_DEVICE(0x8086, 0x0181) },
 	{ USB_DEVICE(0x8086, 0x1403) },
 	{ USB_DEVICE(0x8086, 0x1405) },
-- 
1.6.6.1

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.