From patchwork Fri Apr 17 19:45:14 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Brownell X-Patchwork-Id: 26133 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id 71612B6F44 for ; Sat, 18 Apr 2009 05:52:43 +1000 (EST) Received: by ozlabs.org (Postfix) id 5BDEADE0FE; Sat, 18 Apr 2009 05:52:43 +1000 (EST) 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 EEC73DE0FC for ; Sat, 18 Apr 2009 05:52:42 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753362AbZDQTwh (ORCPT ); Fri, 17 Apr 2009 15:52:37 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753072AbZDQTwh (ORCPT ); Fri, 17 Apr 2009 15:52:37 -0400 Received: from smtp128.sbc.mail.sp1.yahoo.com ([69.147.65.187]:26618 "HELO smtp128.sbc.mail.sp1.yahoo.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1752470AbZDQTwg (ORCPT ); Fri, 17 Apr 2009 15:52:36 -0400 X-Greylist: delayed 440 seconds by postgrey-1.27 at vger.kernel.org; Fri, 17 Apr 2009 15:52:36 EDT Received: (qmail 85820 invoked from network); 17 Apr 2009 19:45:15 -0000 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=s1024; d=pacbell.net; h=Received:X-YMail-OSG:X-Yahoo-Newman-Property:From:Date:User-Agent:MIME-Version:Subject:To:Content-Type:Content-Transfer-Encoding:Content-Disposition:Message-Id; b=uAEPRIqSA0uLp7c+WD/fljTCEKaK7XGooS9knjKs83CGs4mu5JrVDGT8vRlRvNIA0hSGBBhlY0Y1vD2Bn17ypPJGDOFsyirwcBE2gSRX34LGTNGh5kyYnPyy/efLtBa4Zmx8mXmfKlx3/0GSLm8nMtp8F6jzPGxspFkhO6qWer4= ; Received: from unknown (HELO albert) (david-b@69.226.223.132 with plain) by smtp128.sbc.mail.sp1.yahoo.com with SMTP; 17 Apr 2009 19:45:15 -0000 X-YMail-OSG: KfhrpecVM1mVPOLC0kG50HpeVPnEzMCVI7TTEIqdV3pB6cN2RfH7IxM6l1ejtGmzoC68ecQX7mnsIF_x8Zn.2XGBUXyST8gT7j6ziE7ljmqiyDLfRRO4HnTM8dcG7.GOZMnbuzfodIJ7OLHAgMW.DYAokuQwrgjsghTu6BWnPRh.IrqKgX7nhlQkUXfVoLU73adyxMac6TaTUtqxLhX7t7XN5vn2bSsMmziZ0nhox0ZFmT8BPuI3xpluwR3mBoBaQVHwbtxJ7wyzSdJQaxOKB4s_.27_G7FeKyNMLmidcQ1fud2hrl8- X-Yahoo-Newman-Property: ymail-3 From: David Brownell Date: Fri, 17 Apr 2009 12:45:14 -0700 User-Agent: KMail/1.9.10 MIME-Version: 1.0 Subject: Fwd: [PATCH 01/22] usb gadget: fix ethernet link reports to ethtool To: Network development list Content-Disposition: inline Message-Id: <200904171245.14785.david-b@pacbell.net> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hmm, I should probably try to cc netdev on some of these patches. They're fairly infrequent any more, but... Likewise, it'd be good to get cc'd from netdev on patches that affect drivers/usb/gadget ... I was very recently surprised to see a "phonet" driver just appear. - Dave ---------- Forwarded Message ---------- Subject: [PATCH 01/22] usb gadget: fix ethernet link reports to ethtool Date: Friday 17 April 2009 From: "Greg Kroah-Hartman" To: linux-usb@vger.kernel.org From: Jonathan McDowell The g_ether USB gadget driver currently decides whether or not there's a link to report back for eth_get_link based on if the USB link speed is set. The USB gadget speed is however often set even before the device is enumerated. It seems more sensible to only report a "link" if we're actually connected to a host that wants to talk to us. The patch below does this for me - tested with the PXA27x UDC driver. Signed-off-by: Jonathan McDowell Signed-off-by: David Brownell Cc: stable Signed-off-by: Greg Kroah-Hartman --- drivers/usb/gadget/u_ether.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/drivers/usb/gadget/u_ether.c b/drivers/usb/gadget/u_ether.c index 96d65ca..4007770 100644 --- a/drivers/usb/gadget/u_ether.c +++ b/drivers/usb/gadget/u_ether.c @@ -175,12 +175,6 @@ static void eth_get_drvinfo(struct net_device *net, struct ethtool_drvinfo *p) strlcpy(p->bus_info, dev_name(&dev->gadget->dev), sizeof p->bus_info); } -static u32 eth_get_link(struct net_device *net) -{ - struct eth_dev *dev = netdev_priv(net); - return dev->gadget->speed != USB_SPEED_UNKNOWN; -} - /* REVISIT can also support: * - WOL (by tracking suspends and issuing remote wakeup) * - msglevel (implies updated messaging) @@ -189,7 +183,7 @@ static u32 eth_get_link(struct net_device *net) static struct ethtool_ops ops = { .get_drvinfo = eth_get_drvinfo, - .get_link = eth_get_link + .get_link = ethtool_op_get_link, }; static void defer_kevent(struct eth_dev *dev, int flag)