patch-2.1.9 linux/net/socket.c

Next file: linux/net/sysctl_net.c
Previous file: linux/net/rose/sysctl_net_rose.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.8/linux/net/socket.c linux/net/socket.c
@@ -67,7 +67,7 @@
 #include <linux/proc_fs.h>
 #include <linux/firewall.h>
 
-#ifdef CONFIG_KERNELD
+#if defined(CONFIG_KERNELD) && defined(CONFIG_NET)
 #include <linux/kerneld.h>
 #endif
 
@@ -536,8 +536,13 @@
 	/* Locate the correct protocol family. */
 	i = find_protocol_family(family);
 
-#ifdef CONFIG_KERNELD
-	/* Attempt to load a protocol module if the find failed. */
+#if defined(CONFIG_KERNELD) && defined(CONFIG_NET)
+	/* Attempt to load a protocol module if the find failed. 
+	 * 
+	 * 12/09/1996 Marcin: But! this makes REALLY only sense, if the user 
+	 * requested real, full-featured networking support upon configuration.
+	 * Otherwise module support will break!
+	 */
 	if (i < 0)
 	{
 		char module_name[30];

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov