diff options
| author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2007-05-30 07:33:47 +0200 |
|---|---|---|
| committer | Chris Wright <chrisw@sous-sol.org> | 2007-06-11 11:36:46 -0700 |
| commit | 89f518f161a04e825e9143778521afe8c4c1adf0 (patch) | |
| tree | edbf8624e92f495ca8053c5c9c3573446628545b | |
| parent | 6f27f35162b8bcdcc598b49449b2801fa80084c7 (diff) | |
| download | linux-stable-89f518f161a04e825e9143778521afe8c4c1adf0.tar.gz linux-stable-89f518f161a04e825e9143778521afe8c4c1adf0.tar.bz2 linux-stable-89f518f161a04e825e9143778521afe8c4c1adf0.zip | |
[PATCH] 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>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | 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 03e44b337eb0..6c819513a930 100644 --- a/drivers/ieee1394/eth1394.c +++ b/drivers/ieee1394/eth1394.c @@ -584,10 +584,9 @@ static void ether1394_add_host (struct hpsb_host *host) } 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); |