]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
ieee1394: eth1394: revert parent device to that in 2.6.20
authorStefan Richter <stefanr@s5r6.in-berlin.de>
Sun, 27 May 2007 21:14:05 +0000 (23:14 +0200)
committerStefan Richter <stefanr@s5r6.in-berlin.de>
Mon, 9 Jul 2007 22:07:40 +0000 (00:07 +0200)
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>
drivers/ieee1394/eth1394.c

index 7c13fb3c167b02b541834283d272d1a5a17f5860..93362eed94eda0be345958ab069f0f78935c6443 100644 (file)
@@ -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);