1 files changed, 63 insertions, 42 deletions

diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c
index 21e1ba160008..3547cf13d219 100644
--- a/drivers/net/usb/cdc_ether.c
+++ b/drivers/net/usb/cdc_ether.c
@@ -37,23 +37,23 @@
 
 static int is_rndis(struct usb_interface_descriptor *desc)
 {
-        return desc->bInterfaceClass == USB_CLASS_COMM
-                && desc->bInterfaceSubClass == 2
-                && desc->bInterfaceProtocol == 0xff;
+        return (desc->bInterfaceClass == USB_CLASS_COMM &&
+                desc->bInterfaceSubClass == 2 &&
+                desc->bInterfaceProtocol == 0xff);
 }
 
 static int is_activesync(struct usb_interface_descriptor *desc)
 {
-        return desc->bInterfaceClass == USB_CLASS_MISC
-                && desc->bInterfaceSubClass == 1
-                && desc->bInterfaceProtocol == 1;
+        return (desc->bInterfaceClass == USB_CLASS_MISC &&
+                desc->bInterfaceSubClass == 1 &&
+                desc->bInterfaceProtocol == 1);
 }
 
 static int is_wireless_rndis(struct usb_interface_descriptor *desc)
 {
-        return desc->bInterfaceClass == USB_CLASS_WIRELESS_CONTROLLER
-                && desc->bInterfaceSubClass == 1
-                && desc->bInterfaceProtocol == 3;
+        return (desc->bInterfaceClass == USB_CLASS_WIRELESS_CONTROLLER &&
+                desc->bInterfaceSubClass == 1 &&
+                desc->bInterfaceProtocol == 3);
 }
 
 #else
@@ -116,9 +116,9 @@ int usbnet_generic_cdc_bind(struct usbnet *dev, struct usb_interface *intf)
         /* this assumes that if there's a non-RNDIS vendor variant
          * of cdc-acm, it'll fail RNDIS requests cleanly.
          */
-        rndis = is_rndis(&intf->cur_altsetting->desc)
-                || is_activesync(&intf->cur_altsetting->desc)
-                || is_wireless_rndis(&intf->cur_altsetting->desc);
+        rndis = (is_rndis(&intf->cur_altsetting->desc) ||
+                 is_activesync(&intf->cur_altsetting->desc) ||
+                 is_wireless_rndis(&intf->cur_altsetting->desc));
 
         memset(info, 0, sizeof *info);
         info->control = intf;
@@ -279,10 +279,10 @@ next_desc:
 
                 dev->status = &info->control->cur_altsetting->endpoint [0];
                 desc = &dev->status->desc;
-                if (!usb_endpoint_is_int_in(desc)
-                                || (le16_to_cpu(desc->wMaxPacketSize)
-                                        < sizeof(struct usb_cdc_notification))
-                                || !desc->bInterval) {
+                if (!usb_endpoint_is_int_in(desc) ||
+                    (le16_to_cpu(desc->wMaxPacketSize)
+                     < sizeof(struct usb_cdc_notification)) ||
+                    !desc->bInterval) {
                         dev_dbg(&intf->dev, "bad notification endpoint\n");
                         dev->status = NULL;
                 }
@@ -339,10 +339,10 @@ EXPORT_SYMBOL_GPL(usbnet_cdc_unbind);
 
 static void dumpspeed(struct usbnet *dev, __le32 *speeds)
 {
-        if (netif_msg_timer(dev))
-                devinfo(dev, "link speeds: %u kbps up, %u kbps down",
-                        __le32_to_cpu(speeds[0]) / 1000,
-                __le32_to_cpu(speeds[1]) / 1000);
+        netif_info(dev, timer, dev->net,
+                   "link speeds: %u kbps up, %u kbps down\n",
+                   __le32_to_cpu(speeds[0]) / 1000,
+                   __le32_to_cpu(speeds[1]) / 1000);
 }
 
 static void cdc_status(struct usbnet *dev, struct urb *urb)
@@ -361,18 +361,16 @@ static void cdc_status(struct usbnet *dev, struct urb *urb)
         event = urb->transfer_buffer;
         switch (event->bNotificationType) {
         case USB_CDC_NOTIFY_NETWORK_CONNECTION:
-                if (netif_msg_timer(dev))
-                        devdbg(dev, "CDC: carrier %s",
-                                        event->wValue ? "on" : "off");
+                netif_dbg(dev, timer, dev->net, "CDC: carrier %s\n",
+                          event->wValue ? "on" : "off");
                 if (event->wValue)
                         netif_carrier_on(dev->net);
                 else
                         netif_carrier_off(dev->net);
                 break;
         case USB_CDC_NOTIFY_SPEED_CHANGE:       /* tx/rx rates */
-                if (netif_msg_timer(dev))
-                        devdbg(dev, "CDC: speed change (len %d)",
-                                        urb->actual_length);
+                netif_dbg(dev, timer, dev->net, "CDC: speed change (len %d)\n",
+                          urb->actual_length);
                 if (urb->actual_length != (sizeof *event + 8))
                         set_bit(EVENT_STS_SPLIT, &dev->flags);
                 else
@@ -382,8 +380,8 @@ static void cdc_status(struct usbnet *dev, struct urb *urb)
          * but there are no standard formats for the response data.
          */
         default:
-                deverr(dev, "CDC: unexpected notification %02x!",
-                                 event->bNotificationType);
+                netdev_err(dev->net, "CDC: unexpected notification %02x!\n",
+                           event->bNotificationType);
                 break;
         }
 }
@@ -411,6 +409,12 @@ static int cdc_bind(struct usbnet *dev, struct usb_interface *intf)
         return 0;
 }
 
+static int cdc_manage_power(struct usbnet *dev, int on)
+{
+        dev->intf->needs_remote_wakeup = on;
+        return 0;
+}
+
 static const struct driver_info cdc_info = {
         .description =  "CDC Ethernet Device",
         .flags =        FLAG_ETHER,
@@ -418,6 +422,16 @@ static const struct driver_info	cdc_info = {
         .bind =         cdc_bind,
         .unbind =       usbnet_cdc_unbind,
         .status =       cdc_status,
+        .manage_power = cdc_manage_power,
+};
+
+static const struct driver_info mbm_info = {
+        .description =  "Mobile Broadband Network Device",
+        .flags =        FLAG_WWAN,
+        .bind =         cdc_bind,
+        .unbind =       usbnet_cdc_unbind,
+        .status =       cdc_status,
+        .manage_power = cdc_manage_power,
 };
 
 /*-------------------------------------------------------------------------*/
@@ -532,72 +546,77 @@ static const struct usb_device_id	products [] = {
         /* Ericsson F3507g */
         USB_DEVICE_AND_INTERFACE_INFO(0x0bdb, 0x1900, USB_CLASS_COMM,
                         USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
-        .driver_info = (unsigned long) &cdc_info,
+        .driver_info = (unsigned long) &mbm_info,
 }, {
         /* Ericsson F3507g ver. 2 */
         USB_DEVICE_AND_INTERFACE_INFO(0x0bdb, 0x1902, 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 */
         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 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,
+}, {
+        /* Ericsson C3607w ver 2 */
+        USB_DEVICE_AND_INTERFACE_INFO(0x0bdb, 0x190b, USB_CLASS_COMM,
+                        USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
+        .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
 };
@@ -610,6 +629,8 @@ static struct usb_driver cdc_driver = {
         .disconnect =   usbnet_disconnect,
         .suspend =      usbnet_suspend,
         .resume =       usbnet_resume,
+        .reset_resume = usbnet_resume,
+        .supports_autosuspend = 1,
 };