Date: Tue, 20 Mar 2007 22:43:22 +0100 (CET)
From: Stefan Richter <stefanr@s5r6.in-berlin.de>
Subject: ieee1394: fix oops on "modprobe -r ohci1394" after network class_device conversion

The networking subsystem has been converted from class_device to device
but ieee1394 hasn't.  This results in a 100% reproducible NULL pointer
dereference if the ohci1394 driver module is unloaded while the eth1394
module is still loaded.
http://lkml.org/lkml/2006/11/16/147
http://lkml.org/lkml/2007/3/14/4

This is a regression in 2.6.21-rc1.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Tested-by: Ismail Dönmez <ismail@pardus.org.tr>
---

Index: linux-2.6.21-rc4/drivers/ieee1394/eth1394.c
===================================================================
--- linux-2.6.21-rc4.orig/drivers/ieee1394/eth1394.c	2007-03-16 19:24:44.000000000 +0100
+++ linux-2.6.21-rc4/drivers/ieee1394/eth1394.c	2007-03-20 22:28:49.000000000 +0100
@@ -586,7 +586,10 @@ static void ether1394_add_host (struct h
         }
 
 	SET_MODULE_OWNER(dev);
+#if 0
+	/* FIXME - Is this the correct parent device anyway? */
 	SET_NETDEV_DEV(dev, &host->device);
+#endif
 
 	priv = netdev_priv(dev);