From 1093ef2deb4c600681850f0504aa541fb51144ce Mon Sep 17 00:00:00 2001 From: Ming Lei Date: Thu, 11 Apr 2013 04:40:34 +0000 Subject: [PATCH] --- yaml --- r: 369191 b: refs/heads/master c: eae65919aa66ca7ec6f02a0a61076ecf0577ff60 h: refs/heads/master i: 369189: 4d915f2b0360126b59e0d36b34fca58347018186 369187: 67c27e4201b7ccb7c42fe1fa70c3f310052a4b15 369183: 5bfa7525443cd940bc8a82ec6db7865e7bd5b7cc v: v3 --- [refs] | 2 +- trunk/drivers/net/usb/asix_devices.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index baa38ab2b598..3c9f43c85911 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8a34b0ae8778f6b42ed38857486b769a224e2536 +refs/heads/master: eae65919aa66ca7ec6f02a0a61076ecf0577ff60 diff --git a/trunk/drivers/net/usb/asix_devices.c b/trunk/drivers/net/usb/asix_devices.c index 709753469099..ad5d1e4384db 100644 --- a/trunk/drivers/net/usb/asix_devices.c +++ b/trunk/drivers/net/usb/asix_devices.c @@ -55,11 +55,7 @@ static void asix_status(struct usbnet *dev, struct urb *urb) event = urb->transfer_buffer; link = event->link & 0x01; if (netif_carrier_ok(dev->net) != link) { - if (link) { - netif_carrier_on(dev->net); - usbnet_defer_kevent (dev, EVENT_LINK_RESET ); - } else - netif_carrier_off(dev->net); + usbnet_link_change(dev, link, 1); netdev_dbg(dev->net, "Link Status is: %d\n", link); } }