From ae3331e806d644bfa9ac45830292d69964dee5de Mon Sep 17 00:00:00 2001
From: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date: Mon, 21 May 2007 01:05:41 +0200
Subject: [PATCH] --- yaml --- r: 57057 b: refs/heads/master c:
 ef50a6c59dc66f22eba67704e291d709f21e0456 h: refs/heads/master i:   57055:
 8a48ba73f3e84c073a7341868634252bdd65fd37 v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/ieee1394/eth1394.c | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 0cc077f8aeef..33a0a07258fe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7a97bc03e089d1a75dc533f0fe69ec8dac672916
+refs/heads/master: ef50a6c59dc66f22eba67704e291d709f21e0456
diff --git a/trunk/drivers/ieee1394/eth1394.c b/trunk/drivers/ieee1394/eth1394.c
index d6b19c2780af..5f026b5d7857 100644
--- a/trunk/drivers/ieee1394/eth1394.c
+++ b/trunk/drivers/ieee1394/eth1394.c
@@ -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);