Skip to content

Commit

Permalink
ieee1394: eth1394: bring back a parent device
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Stefan Richter committed May 27, 2007
1 parent 7a97bc0 commit ef50a6c
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions drivers/ieee1394/eth1394.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit ef50a6c

Please sign in to comment.