From: David S. Miller <davem@davemloft.net>
Date: Fri, 6 Nov 2009 08:55:55 +0000 (-0800)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.33-rc1~388^2~488
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=230f9bb701d37ae9b48e96456689452978f5c439;p=~shefty%2Frdma-dev.git

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	drivers/net/usb/cdc_ether.c

All CDC ethernet devices of type USB_CLASS_COMM need to use
'&mbm_info'.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

230f9bb701d37ae9b48e96456689452978f5c439
diff --cc drivers/net/usb/cdc_ether.c
index 71e65fc10e6,21e1ba16000..71d7ff3de99
--- a/drivers/net/usb/cdc_ether.c
+++ b/drivers/net/usb/cdc_ether.c
@@@ -550,22 -542,62 +550,62 @@@ static const struct usb_device_id	produ
  	/* Ericsson F3607gw */
  	USB_DEVICE_AND_INTERFACE_INFO(0x0bdb, 0x1904, USB_CLASS_COMM,
  			USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
 -	.driver_info = (unsigned long) &cdc_info,
 +	.driver_info = (unsigned long) &mbm_info,
  }, {
- 	/* Ericsson F3307 */
+ 	/* Ericsson F3607gw ver 2 */
+ 	USB_DEVICE_AND_INTERFACE_INFO(0x0bdb, 0x1905, USB_CLASS_COMM,
+ 			USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
 -	.driver_info = (unsigned long) &cdc_info,
++	.driver_info = (unsigned long) &mbm_info,
+ }, {
+ 	/* Ericsson F3607gw ver 3 */
  	USB_DEVICE_AND_INTERFACE_INFO(0x0bdb, 0x1906, USB_CLASS_COMM,
  			USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
 -	.driver_info = (unsigned long) &cdc_info,
 +	.driver_info = (unsigned long) &mbm_info,
+ }, {
+ 	/* Ericsson F3307 */
+ 	USB_DEVICE_AND_INTERFACE_INFO(0x0bdb, 0x190a, USB_CLASS_COMM,
+ 			USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
 -	.driver_info = (unsigned long) &cdc_info,
++	.driver_info = (unsigned long) &mbm_info,
+ }, {
+ 	/* Ericsson F3307 ver 2 */
+ 	USB_DEVICE_AND_INTERFACE_INFO(0x0bdb, 0x1909, USB_CLASS_COMM,
+ 			USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
 -	.driver_info = (unsigned long) &cdc_info,
++	.driver_info = (unsigned long) &mbm_info,
+ }, {
+ 	/* Ericsson C3607w */
+ 	USB_DEVICE_AND_INTERFACE_INFO(0x0bdb, 0x1049, USB_CLASS_COMM,
+ 			USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
 -	.driver_info = (unsigned long) &cdc_info,
++	.driver_info = (unsigned long) &mbm_info,
  }, {
  	/* Toshiba F3507g */
  	USB_DEVICE_AND_INTERFACE_INFO(0x0930, 0x130b, USB_CLASS_COMM,
  			USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
 -	.driver_info = (unsigned long) &cdc_info,
 +	.driver_info = (unsigned long) &mbm_info,
+ }, {
+ 	/* Toshiba F3607gw */
+ 	USB_DEVICE_AND_INTERFACE_INFO(0x0930, 0x130c, USB_CLASS_COMM,
+ 			USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
 -	.driver_info = (unsigned long) &cdc_info,
++	.driver_info = (unsigned long) &mbm_info,
+ }, {
+ 	/* Toshiba F3607gw ver 2 */
+ 	USB_DEVICE_AND_INTERFACE_INFO(0x0930, 0x1311, USB_CLASS_COMM,
+ 			USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
 -	.driver_info = (unsigned long) &cdc_info,
++	.driver_info = (unsigned long) &mbm_info,
  }, {
  	/* Dell F3507g */
  	USB_DEVICE_AND_INTERFACE_INFO(0x413c, 0x8147, USB_CLASS_COMM,
  			USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
 -	.driver_info = (unsigned long) &cdc_info,
 +	.driver_info = (unsigned long) &mbm_info,
+ }, {
+ 	/* Dell F3607gw */
+ 	USB_DEVICE_AND_INTERFACE_INFO(0x413c, 0x8183, USB_CLASS_COMM,
+ 			USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
 -	.driver_info = (unsigned long) &cdc_info,
++	.driver_info = (unsigned long) &mbm_info,
+ }, {
+ 	/* Dell F3607gw ver 2 */
+ 	USB_DEVICE_AND_INTERFACE_INFO(0x413c, 0x8184, USB_CLASS_COMM,
+ 			USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
 -	.driver_info = (unsigned long) &cdc_info,
++	.driver_info = (unsigned long) &mbm_info,
  },
  	{ },		// END
  };