Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S939760AbXFHHyw (ORCPT ); Fri, 8 Jun 2007 03:54:52 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S938406AbXFHHZV (ORCPT ); Fri, 8 Jun 2007 03:25:21 -0400 Received: from 216-99-217-87.dsl.aracnet.com ([216.99.217.87]:55356 "EHLO sous-sol.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S938325AbXFHHZL (ORCPT ); Fri, 8 Jun 2007 03:25:11 -0400 Message-Id: <20070608072159.888965000@sous-sol.org> References: <20070608072127.352723000@sous-sol.org> User-Agent: quilt/0.46-1 Date: Fri, 08 Jun 2007 00:21:44 -0700 From: Chris Wright To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: Justin Forbes , Zwane Mwaikambo , "Theodore Ts'o" , Randy Dunlap , Dave Jones , Chuck Wolber , Chris Wedgwood , Michael Krufky , Chuck Ebbert , Domenico Andreoli , torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, Stefan Richter , Greg Kroah-Hartman Subject: [patch 17/54] ieee1394: eth1394: bring back a parent device Content-Disposition: inline; filename=ieee1394-eth1394-bring-back-a-parent-device.patch Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1679 Lines: 49 -stable review patch. If anyone has any objections, please let us know. --------------------- From: Stefan Richter This adds a real parent device to eth1394's ethX device like in Linux 2.6.20 and older. However, due to unfinished conversion of the ieee1394 away from class_device, we now refer to the FireWire controller's PCI device as the parent, not to the ieee1394 driver's fw-host device. Having a real parent device instead of a virtual one allows udev scripts to distinguish eth1394 interfaces from networking bridges, bondings and the likes. Fixes a regression since 2.6.21: https://bugs.gentoo.org/show_bug.cgi?id=177199 Signed-off-by: Stefan Richter Signed-off-by: Chris Wright Signed-off-by: Greg Kroah-Hartman --- Same as commit ef50a6c59dc66f22eba67704e291d709f21e0456. drivers/ieee1394/eth1394.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) --- linux-2.6.21.4.orig/drivers/ieee1394/eth1394.c +++ linux-2.6.21.4/drivers/ieee1394/eth1394.c @@ -584,10 +584,9 @@ static void ether1394_add_host (struct h } SET_MODULE_OWNER(dev); -#if 0 - /* FIXME - Is this the correct parent device anyway? */ - SET_NETDEV_DEV(dev, &host->device); -#endif + + /* This used to be &host->device in Linux 2.6.20 and before. */ + SET_NETDEV_DEV(dev, host->device.parent); priv = netdev_priv(dev); -- - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/