From patchwork Thu Dec 3 10:02:56 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver Neukum X-Patchwork-Id: 40140 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.176.167]) by ozlabs.org (Postfix) with ESMTP id A2183B7B6A for ; Thu, 3 Dec 2009 21:03:01 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755847AbZLCKCp (ORCPT ); Thu, 3 Dec 2009 05:02:45 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755887AbZLCKCp (ORCPT ); Thu, 3 Dec 2009 05:02:45 -0500 Received: from smtp-out002.kontent.com ([81.88.40.216]:37575 "EHLO smtp-out002.kontent.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752144AbZLCKCo (ORCPT ); Thu, 3 Dec 2009 05:02:44 -0500 Received: from vanamonde.localnet (p549A1F75.dip0.t-ipconnect.de [84.154.31.117]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: neukum_org@smtp-out002.kontent.com) by smtp-out002.kontent.com (Postfix) with ESMTPSA id E1759598634C; Thu, 3 Dec 2009 11:02:50 +0100 (CET) From: Oliver Neukum To: David Miller Subject: Re: [patch]reset_resume for cdc-ether Date: Thu, 3 Dec 2009 11:02:56 +0100 User-Agent: KMail/1.12.2 (Linux/2.6.32-rc6-0.1-default; KDE/4.3.1; x86_64; ; ) Cc: david-b@pacbell.net, netdev@vger.kernel.org, linux-usb@vger.kernel.org References: <200911241159.02098.oliver@neukum.org> <20091202.221627.133392199.davem@davemloft.net> <20091202.222254.61468873.davem@davemloft.net> In-Reply-To: <20091202.222254.61468873.davem@davemloft.net> MIME-Version: 1.0 Message-Id: <200912031102.56903.oliver@neukum.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Am Donnerstag, 3. Dezember 2009 07:22:54 schrieb David Miller: > > I'm going to apply this patch and the USB autosuspend one too. > > Actually, neither patch applies to net-next-2.6 > > Oliver can you respin your changes and add a proper signoff > to the autosuspend patch? Hi, here's reset_resume() again. Regards Oliver Signed-off-by: Oliver Neukum --- commit 0cf82130a576e01d516fcd81a0a6976ab7c49c23 Author: Oliver Neukum Date: Thu Dec 3 10:59:20 2009 +0100 cdc-ether:imlement reset_resume() Normal resume can do double duty as reset_resume() for this driver as it keeps no state in the device Signed-off-by: Oliver Neukum -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c index b9493ef..50b8aa9 100644 --- a/drivers/net/usb/cdc_ether.c +++ b/drivers/net/usb/cdc_ether.c @@ -585,6 +585,7 @@ static struct usb_driver cdc_driver = { .disconnect = usbnet_disconnect, .suspend = usbnet_suspend, .resume = usbnet_resume, + .reset_resume = usbnet_resume, .supports_autosuspend = 1, };