]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
usbnet: ax88179_1781: apply usbnet_link_change
authorMing Lei <ming.lei@canonical.com>
Thu, 11 Apr 2013 04:40:35 +0000 (04:40 +0000)
committerDavid S. Miller <davem@davemloft.net>
Thu, 11 Apr 2013 19:57:17 +0000 (15:57 -0400)
Use usbnet_link_change to handle link change centrally.

Signed-off-by: Ming Lei <ming.lei@canonical.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/usb/ax88179_178a.c

index 71c27d8d214fd3b08b9f974a90faa77bcf0e83e0..bd8758fa38c140cf93dd3c8b623a3d9b61a279fe 100644 (file)
@@ -352,11 +352,7 @@ static void ax88179_status(struct usbnet *dev, struct urb *urb)
        link = (((__force u32)event->intdata1) & AX_INT_PPLS_LINK) >> 16;
 
        if (netif_carrier_ok(dev->net) != link) {
-               if (link)
-                       usbnet_defer_kevent(dev, EVENT_LINK_RESET);
-               else
-                       netif_carrier_off(dev->net);
-
+               usbnet_link_change(dev, link, 1);
                netdev_info(dev->net, "ax88179 - Link status is: %d\n", link);
        }
 }
@@ -455,7 +451,7 @@ static int ax88179_resume(struct usb_interface *intf)
        u16 tmp16;
        u8 tmp8;
 
-       netif_carrier_off(dev->net);
+       usbnet_link_change(dev, 0, 0);
 
        /* Power up ethernet PHY */
        tmp16 = 0;
@@ -1068,7 +1064,7 @@ static int ax88179_bind(struct usbnet *dev, struct usb_interface *intf)
        /* Restart autoneg */
        mii_nway_restart(&dev->mii);
 
-       netif_carrier_off(dev->net);
+       usbnet_link_change(dev, 0, 0);
 
        return 0;
 }
@@ -1356,7 +1352,7 @@ static int ax88179_reset(struct usbnet *dev)
        /* Restart autoneg */
        mii_nway_restart(&dev->mii);
 
-       netif_carrier_off(dev->net);
+       usbnet_link_change(dev, 0, 0);
 
        return 0;
 }