Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f9fd2394 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'linux-2.6.33.y' of git://git.kernel.org/pub/scm/linux/kernel/git/inaky/wimax

parents 6be32571 b8112469

drivers/net/wimax/i2400m/i2400m-usb.h

+2 −0
Original line number Diff line number Diff line
@@ -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 */

};

drivers/net/wimax/i2400m/usb.c

+11 −1
Original line number Diff line number Diff line
@@ -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) },