Commit:     ef50a6c59dc66f22eba67704e291d709f21e0456
Parent:     7a97bc03e089d1a75dc533f0fe69ec8dac672916
Author:     Stefan Richter <[EMAIL PROTECTED]>
AuthorDate: Mon May 21 01:05:41 2007 +0200
Committer:  Stefan Richter <[EMAIL PROTECTED]>
CommitDate: Sun May 27 23:20:59 2007 +0200

    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:
    Signed-off-by: Stefan Richter <[EMAIL PROTECTED]>
 drivers/ieee1394/eth1394.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/ieee1394/eth1394.c b/drivers/ieee1394/eth1394.c
index d6b19c2..5f026b5 100644
--- a/drivers/ieee1394/eth1394.c
+++ b/drivers/ieee1394/eth1394.c
@@ -599,10 +599,9 @@ static void ether1394_add_host(struct hpsb_host *host)
-#if 0
-       /* FIXME - Is this the correct parent device anyway? */
-       SET_NETDEV_DEV(dev, &host->device);
+       /* 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 git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to