[net-2.6 2.6.33] WiMAX pull request

[net-2.6 2.6.33] WiMAX pull request

[Inaky Perez-Gonzalez]

It might be quite late already for this (conceptually) one liner
patch, submitting just in case. This was a last minute issue we found,
were some i6050 parts have different USB IDs.


The following changes since commit b94b50289622e816adc9f94111cfc2679c80177c:
  Jesse Brandeburg (1):
        e1000e: enhance frame fragment detection

are available in the git repository at:

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

Patches follow for reviewing convenience.

Inaky Perez-Gonzalez (1):
      wimax/i2400m: Add support for more i6x50 SKUs

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

[net-2.6 2.6.33] wimax/i2400m: Add support for more i6x50 SKUs

[Inaky Perez-Gonzalez]

The Intel WiMax Wireless Link 6050 can show under more than one USB
ID. Add support for all, introducing a generic flag (i2400mu->i6050)
that denotes a 6x50 based device.

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

diff --git a/drivers/net/wimax/i2400m/i2400m-usb.h b/drivers/net/wimax/i2400m/i2400m-usb.h
index 5cc0f27..2d7c96d 100644
--- a/drivers/net/wimax/i2400m/i2400m-usb.h
+++ b/drivers/net/wimax/i2400m/i2400m-usb.h
@@ -151,6 +151,7 @@ enum {
 
 	/* Device IDs */
 	USB_DEVICE_ID_I6050 = 0x0186,
+	USB_DEVICE_ID_I6050_2 = 0x0188,
 };
 
 
@@ -234,6 +235,7 @@ struct i2400mu {
 	u8 rx_size_auto_shrink;
 
 	struct dentry *debugfs_dentry;
+	unsigned i6050:1;	/* 1 if this is a 6050 based SKU */
 };
 
 
diff --git a/drivers/net/wimax/i2400m/usb.c b/drivers/net/wimax/i2400m/usb.c
index 3b48681..98f4f8c 100644
--- a/drivers/net/wimax/i2400m/usb.c
+++ b/drivers/net/wimax/i2400m/usb.c
@@ -478,7 +478,16 @@ int i2400mu_probe(struct usb_interface *iface,
 	i2400m->bus_bm_wait_for_ack = i2400mu_bus_bm_wait_for_ack;
 	i2400m->bus_bm_mac_addr_impaired = 0;
 
-	if (id->idProduct == USB_DEVICE_ID_I6050) {
+	switch (id->idProduct) {
+	case USB_DEVICE_ID_I6050:
+	case USB_DEVICE_ID_I6050_2:
+		i2400mu->i6050 = 1;
+		break;
+	default:
+		break;
+	}
+
+	if (i2400mu->i6050) {
 		i2400m->bus_fw_names = i2400mu_bus_fw_names_6050;
 		i2400mu->endpoint_cfg.bulk_out = 0;
 		i2400mu->endpoint_cfg.notification = 3;
@@ -719,6 +728,7 @@ int i2400mu_post_reset(struct usb_interface *iface)
 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, 0x0181) },
 	{ USB_DEVICE(0x8086, 0x1403) },
 	{ USB_DEVICE(0x8086, 0x1405) },
-- 
1.6.2.5

Re: [net-2.6 2.6.33] WiMAX pull request

[David Miller]

From: Inaky Perez-Gonzalez <inaky@linux.intel.com>
Date: Fri, 22 Jan 2010 15:14:40 -0800

> It might be quite late already for this (conceptually) one liner
> patch, submitting just in case. This was a last minute issue we found,
> were some i6050 parts have different USB IDs.

Pulled, thanks.