diff options
author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2007-05-27 17:14:05 -0400 |
---|---|---|
committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2007-07-09 18:07:40 -0400 |
commit | 8e4dc400b7659691abdd92b3fc01ef094fc8a1e7 (patch) | |
tree | 3788f4f49eadb5eece1c60140cf0a2700081dd6a | |
parent | a0e857eeffba8976be6bdb9f4bb011c18eb2aff7 (diff) |
ieee1394: eth1394: revert parent device to that in 2.6.20
After ieee1394 was converted away from class_device like the networking
subsystem was already in 2.6.21, eth1394's device may point to the
fw-host device as its parent again like in 2.6.20.
This affects userspace tools which examine the sysfs representation of
eth1394's device.
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
-rw-r--r-- | drivers/ieee1394/eth1394.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/ieee1394/eth1394.c b/drivers/ieee1394/eth1394.c index 7c13fb3c167b..93362eed94ed 100644 --- a/drivers/ieee1394/eth1394.c +++ b/drivers/ieee1394/eth1394.c | |||
@@ -599,9 +599,7 @@ static void ether1394_add_host(struct hpsb_host *host) | |||
599 | } | 599 | } |
600 | 600 | ||
601 | SET_MODULE_OWNER(dev); | 601 | SET_MODULE_OWNER(dev); |
602 | 602 | SET_NETDEV_DEV(dev, &host->device); | |
603 | /* This used to be &host->device in Linux 2.6.20 and before. */ | ||
604 | SET_NETDEV_DEV(dev, host->device.parent); | ||
605 | 603 | ||
606 | priv = netdev_priv(dev); | 604 | priv = netdev_priv(dev); |
607 | INIT_LIST_HEAD(&priv->ip_node_list); | 605 | INIT_LIST_HEAD(&priv->ip_node_list); |