[PATCH] ieee1394: eth1394: bring back a parent device

[PATCH] ieee1394: eth1394: bring back a parent device

[Stefan Richter]

I will submit this for 2.6.22-rc and 2.6.21.y if nobody objects.

Date: Mon, 21 May 2007 01:05:41 +0200
From: Stefan Richter <stefanr@s5r6.in-berlin.de>
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 <stefanr@s5r6.in-berlin.de>
---
 drivers/ieee1394/eth1394.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

Index: linux-2.6.22-rc2/drivers/ieee1394/eth1394.c
===================================================================
--- linux-2.6.22-rc2.orig/drivers/ieee1394/eth1394.c
+++ linux-2.6.22-rc2/drivers/ieee1394/eth1394.c
@@ -599,10 +599,9 @@ static void ether1394_add_host(struct hp
 	}
 
 	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);
 	INIT_LIST_HEAD(&priv->ip_node_list);

-- 
Stefan Richter
-=====-=-=== -=-= ==-=-
http://arcgraph.de/sr/

Re: [PATCH] ieee1394: eth1394: bring back a parent device

[Greg KH]

On Sat, May 26, 2007 at 12:08:35PM +0200, Stefan Richter wrote:
> I will submit this for 2.6.22-rc and 2.6.21.y if nobody objects.

No objection from me, thanks for fixing this.

greg k-h