diff options
| author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2007-05-21 01:05:41 +0200 |
|---|---|---|
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2007-05-27 23:20:59 +0200 |
| commit | ef50a6c59dc66f22eba67704e291d709f21e0456 (patch) | |
| tree | ef61e38f7b9c019dc4c6d82d91bfcc3597b94747 | |
| parent | 7a97bc03e089d1a75dc533f0fe69ec8dac672916 (diff) | |
| download | blackbird-op-linux-ef50a6c59dc66f22eba67704e291d709f21e0456.tar.gz blackbird-op-linux-ef50a6c59dc66f22eba67704e291d709f21e0456.zip | |
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>
| -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 d6b19c2780af..5f026b5d7857 100644 --- a/drivers/ieee1394/eth1394.c +++ b/drivers/ieee1394/eth1394.c @@ -599,10 +599,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); INIT_LIST_HEAD(&priv->ip_node_list); |
