From patchwork Thu Apr 11 14:40:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lei X-Patchwork-Id: 235762 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 8B8532C00C2 for ; Fri, 12 Apr 2013 00:41:14 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936183Ab3DKOlJ (ORCPT ); Thu, 11 Apr 2013 10:41:09 -0400 Received: from mail-pb0-f43.google.com ([209.85.160.43]:41191 "EHLO mail-pb0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932712Ab3DKOlH (ORCPT ); Thu, 11 Apr 2013 10:41:07 -0400 Received: by mail-pb0-f43.google.com with SMTP id md4so890023pbc.2 for ; Thu, 11 Apr 2013 07:41:07 -0700 (PDT) X-Received: by 10.66.182.168 with SMTP id ef8mr9911231pac.27.1365691267216; Thu, 11 Apr 2013 07:41:07 -0700 (PDT) Received: from localhost ([183.37.202.117]) by mx.google.com with ESMTPS id im2sm4467160pbb.26.2013.04.11.07.41.03 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 11 Apr 2013 07:41:06 -0700 (PDT) From: Ming Lei To: "David S. Miller" , Greg Kroah-Hartman Cc: Oliver Neukum , netdev@vger.kernel.org, linux-usb@vger.kernel.org, Ming Lei Subject: [PATCH 02/11] usbnet: mcs7830: don't reset link Date: Thu, 11 Apr 2013 22:40:31 +0800 Message-Id: <1365691240-816-3-git-send-email-ming.lei@canonical.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1365691240-816-1-git-send-email-ming.lei@canonical.com> References: <1365691240-816-1-git-send-email-ming.lei@canonical.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The driver doesn't implement link_reset() callback, so it needn't to send link reset event. Signed-off-by: Ming Lei --- drivers/net/usb/mcs7830.c | 5 ++--- 1 file 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); }