From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752417AbXE3FeR (ORCPT ); Wed, 30 May 2007 01:34:17 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751360AbXE3FeK (ORCPT ); Wed, 30 May 2007 01:34:10 -0400 Received: from einhorn.in-berlin.de ([192.109.42.8]:50186 "EHLO einhorn.in-berlin.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751354AbXE3FeJ (ORCPT ); Wed, 30 May 2007 01:34:09 -0400 X-Envelope-From: stefanr@s5r6.in-berlin.de Date: Wed, 30 May 2007 07:33:47 +0200 (CEST) From: Stefan Richter Subject: [PATCH 2.6.21.3] ieee1394: eth1394: bring back a parent device To: stable@kernel.org cc: linux-kernel@vger.kernel.org Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; CHARSET=us-ascii Content-Disposition: INLINE Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Date: Mon, 21 May 2007 01:05:41 +0200 From: Stefan Richter Subject: ieee1394: eth1394: bring back a parent device 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 --- Same as commit ef50a6c59dc66f22eba67704e291d709f21e0456. drivers/ieee1394/eth1394.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) Index: linux-2.6.21.3/drivers/ieee1394/eth1394.c =================================================================== --- linux-2.6.21.3.orig/drivers/ieee1394/eth1394.c +++ linux-2.6.21.3/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); -- Stefan Richter -=====-=-=== -=-= ====- http://arcgraph.de/sr/