From: Stefan Richter Date: Sun, 27 May 2007 21:14:05 +0000 (+0200) Subject: ieee1394: eth1394: revert parent device to that in 2.6.20 X-Git-Tag: MMI-PSA29.97-13-9~42388^2~21 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8e4dc400b7659691abdd92b3fc01ef094fc8a1e7;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git 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 --- 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) } 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);