1 files changed, 31 insertions, 7 deletions

diff --git a/drivers/net/usb/sierra_net.c b/drivers/net/usb/sierra_net.c
index a923d61c6fc5..a79e9d334928 100644
--- a/drivers/net/usb/sierra_net.c
+++ b/drivers/net/usb/sierra_net.c
@@ -426,6 +426,13 @@ static void sierra_net_dosync(struct usbnet *dev)
 
         dev_dbg(&dev->udev->dev, "%s", __func__);
 
+        /* The SIERRA_NET_HIP_MSYNC_ID command appears to request that the
+         * firmware restart itself.  After restarting, the modem will respond
+         * with the SIERRA_NET_HIP_RESTART_ID indication.  The driver continues
+         * sending MSYNC commands every few seconds until it receives the
+         * RESTART event from the firmware
+         */
+
         /* tell modem we are ready */
         status = sierra_net_send_sync(dev);
         if (status < 0)
@@ -704,6 +711,9 @@ static int sierra_net_bind(struct usbnet *dev, struct usb_interface *intf)
         /* set context index initially to 0 - prepares tx hdr template */
         sierra_net_set_ctx_index(priv, 0);
 
+        /* prepare sync message template */
+        memcpy(priv->sync_msg, sync_tmplate, sizeof(priv->sync_msg));
+
         /* decrease the rx_urb_size and max_tx_size to 4k on USB 1.1 */
         dev->rx_urb_size  = SIERRA_NET_RX_URB_SIZE;
         if (dev->udev->speed != USB_SPEED_HIGH)
@@ -739,11 +749,6 @@ static int sierra_net_bind(struct usbnet *dev, struct usb_interface *intf)
                 kfree(priv);
                 return -ENODEV;
         }
-        /* prepare sync message from template */
-        memcpy(priv->sync_msg, sync_tmplate, sizeof(priv->sync_msg));
-
-        /* initiate the sync sequence */
-        sierra_net_dosync(dev);
 
         return 0;
 }
@@ -766,8 +771,9 @@ static void sierra_net_unbind(struct usbnet *dev, struct usb_interface *intf)
                 netdev_err(dev->net,
                         "usb_control_msg failed, status %d\n", status);
 
-        sierra_net_set_private(dev, NULL);
+        usbnet_status_stop(dev);
 
+        sierra_net_set_private(dev, NULL);
         kfree(priv);
 }
 
@@ -908,6 +914,24 @@ static const struct driver_info sierra_net_info_direct_ip = {
         .tx_fixup = sierra_net_tx_fixup,
 };
 
+static int
+sierra_net_probe(struct usb_interface *udev, const struct usb_device_id *prod)
+{
+        int ret;
+
+        ret = usbnet_probe(udev, prod);
+        if (ret == 0) {
+                struct usbnet *dev = usb_get_intfdata(udev);
+
+                ret = usbnet_status_start(dev, GFP_KERNEL);
+                if (ret == 0) {
+                        /* Interrupt URB now set up; initiate sync sequence */
+                        sierra_net_dosync(dev);
+                }
+        }
+        return ret;
+}
+
 #define DIRECT_IP_DEVICE(vend, prod) \
         {USB_DEVICE_INTERFACE_NUMBER(vend, prod, 7), \
         .driver_info = (unsigned long)&sierra_net_info_direct_ip}, \
@@ -930,7 +954,7 @@ MODULE_DEVICE_TABLE(usb, products);
 static struct usb_driver sierra_net_driver = {
         .name = "sierra_net",
         .id_table = products,
-        .probe = usbnet_probe,
+        .probe = sierra_net_probe,
         .disconnect = usbnet_disconnect,
         .suspend = usbnet_suspend,
         .resume = usbnet_resume,