summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMing Lei <ming.lei@canonical.com>2013-04-11 04:40:31 (GMT)
committerDavid S. Miller <davem@davemloft.net>2013-04-11 19:57:16 (GMT)
commitf24ba7bce1fa94a865bc30f31d0114d0ffdb0cda (patch)
tree9b2326c9e1ca7adfce39537f28281b81bfc4f90f
parentac64995da872c8ae6f74a5556fdad565829985b0 (diff)
downloadlinux-f24ba7bce1fa94a865bc30f31d0114d0ffdb0cda.tar.xz
usbnet: mcs7830: don't reset link
The driver doesn't implement link_reset() callback, so it needn't to send link reset event. Signed-off-by: Ming Lei <ming.lei@canonical.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/usb/mcs7830.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/usb/mcs7830.c b/drivers/net/usb/mcs7830.c
index 3f3f566..e1c00e9 100644
--- a/drivers/net/usb/mcs7830.c
+++ b/drivers/net/usb/mcs7830.c
@@ -576,10 +576,9 @@ static void mcs7830_status(struct usbnet *dev, struct urb *urb)
*/
if (data->link_counter > 20) {
data->link_counter = 0;
- if (link) {
+ if (link)
netif_carrier_on(dev->net);
- usbnet_defer_kevent(dev, EVENT_LINK_RESET);
- } else
+ else
netif_carrier_off(dev->net);
netdev_dbg(dev->net, "Link Status is: %d\n", link);
}