[patch] hotplug fixes Re: test11-pre6

From: Tigran Aivazian (tigran@veritas.com)
Date: Fri Nov 17 2000 - 06:51:03 EST


On Thu, 16 Nov 2000, Linus Torvalds wrote:

>
> The log-file says it all..
>
> Linus

No, I am sorry but it does not mention hotplug things in net/core/dev.c
and they are broken. The fix below.

Regards,
Tigran

diff -urN -X dontdiff linux/init/main.c work/init/main.c
--- linux/init/main.c Fri Nov 17 10:29:34 2000
+++ work/init/main.c Fri Nov 17 11:27:27 2000
@@ -712,11 +712,13 @@
         init_pcmcia_ds(); /* Do this last */
 #endif
 
+#ifdef CONFIG_HOTPLUG
         /* do this after other 'do this last' stuff, because we want
          * to minimize spurious executions of /sbin/hotplug
          * during boot-up
          */
         net_notifier_init();
+#endif
 
         /* Mount the root filesystem.. */
         mount_root();
diff -urN -X dontdiff linux/net/core/dev.c work/net/core/dev.c
--- linux/net/core/dev.c Fri Nov 17 10:29:34 2000
+++ work/net/core/dev.c Fri Nov 17 11:27:15 2000
@@ -2704,6 +2704,7 @@
         return 0;
 }
 
+#ifdef CONFIG_HOTPLUG
 
 /* Notify userspace when a netdevice event occurs,
  * by running '/sbin/hotplug net' with certain
@@ -2765,3 +2766,4 @@
                 printk (KERN_WARNING "unable to register netdev notifier\n"
                         KERN_WARNING "/sbin/hotplug will not be run.\n");
 }
+#endif

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Thu Nov 23 2000 - 21:00:12 EST