patch-2.4.27 linux-2.4.27/net/bridge/br.c

• Lines: 28
• Date: 2004-08-07 16:26:06.820435779 -0700
• Orig file: linux-2.4.26/net/bridge/br.c
• Orig date: 2002-11-28 15:53:15.000000000 -0800

diff -urN linux-2.4.26/net/bridge/br.c linux-2.4.27/net/bridge/br.c
@@ -22,6 +22,7 @@
 #include <linux/init.h>
 #include <linux/if_bridge.h>
 #include <linux/brlock.h>
+#include <linux/rtnetlink.h>
 #include <asm/uaccess.h>
 #include "br_private.h"
 
@@ -54,15 +55,13 @@
 	return 0;
 }
 
-static void __br_clear_ioctl_hook(void)
-{
-	br_ioctl_hook = NULL;
-}
-
 static void __exit br_deinit(void)
 {
 	unregister_netdevice_notifier(&br_device_notifier);
-	br_call_ioctl_atomic(__br_clear_ioctl_hook);
+
+	rtnl_lock();
+	br_ioctl_hook = NULL;
+	rtnl_unlock();
 
 	br_write_lock_bh(BR_NETPROTO_LOCK);
 	br_handle_frame_hook = NULL;