summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Richter <stefanr@s5r6.in-berlin.de>2007-05-27 23:14:05 +0200
committerStefan Richter <stefanr@s5r6.in-berlin.de>2007-07-10 00:07:40 +0200
commit8e4dc400b7659691abdd92b3fc01ef094fc8a1e7 (patch)
tree3788f4f49eadb5eece1c60140cf0a2700081dd6a
parenta0e857eeffba8976be6bdb9f4bb011c18eb2aff7 (diff)
downloadop-kernel-dev-8e4dc400b7659691abdd92b3fc01ef094fc8a1e7.zip
op-kernel-dev-8e4dc400b7659691abdd92b3fc01ef094fc8a1e7.tar.gz
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.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/ieee1394/eth1394.c b/drivers/ieee1394/eth1394.c
index 7c13fb3..93362ee 100644
--- a/drivers/ieee1394/eth1394.c
+++ b/drivers/ieee1394/eth1394.c
@@ -599,9 +599,7 @@ static void ether1394_add_host(struct hpsb_host *host)
}
SET_MODULE_OWNER(dev);
-
- /* This used to be &host->device in Linux 2.6.20 and before. */
- SET_NETDEV_DEV(dev, host->device.parent);
+ SET_NETDEV_DEV(dev, &host->device);
priv = netdev_priv(dev);
INIT_LIST_HEAD(&priv->ip_node_list);
OpenPOWER on IntegriCloud