patch-2.4.0-test10 linux/net/socket.c

• Lines: 68
• Date: Mon Oct 23 21:59:04 2000
• Orig file: v2.4.0-test9/linux/net/socket.c
• Orig date: Sun Oct 8 10:50:39 2000

diff -u --recursive --new-file v2.4.0-test9/linux/net/socket.c linux/net/socket.c
@@ -1490,7 +1490,7 @@
 /*
  *	Perform a file control on a socket file descriptor.
  *
- *	Doesn't aquire a fd lock, because no network fcntl
+ *	Doesn't acquire a fd lock, because no network fcntl
  *	function sleeps currently.
  */
 
@@ -1638,27 +1638,9 @@
 	return 0;
 }
 
-void __init proto_init(void)
-{
-	extern struct net_proto protocols[];	/* Network protocols */
-	struct net_proto *pro;
-
-	/* Kick all configured protocols. */
-	pro = protocols;
-	while (pro->name != NULL) 
-	{
-		(*pro->init_func)(pro);
-		pro++;
-	}
-	/* We're all done... */
-}
 
 extern void sk_init(void);
 
-#ifdef CONFIG_BRIDGE
-extern int br_init(void);
-#endif
-
 #ifdef CONFIG_WAN_ROUTER
 extern void wanrouter_init(void);
 #endif
@@ -1691,14 +1673,6 @@
 #endif
 
 	/*
-	 *	Ethernet bridge layer.
-	 */
-
-#ifdef CONFIG_BRIDGE
-	br_init();
-#endif
-
-	/*
 	 *	Wan router layer. 
 	 */
 
@@ -1712,10 +1686,13 @@
 
 	register_filesystem(&sock_fs_type);
 	sock_mnt = kern_mount(&sock_fs_type);
-	proto_init();
+	/* The real protocol initialization is performed when
+	 *  do_initcalls is run.  
+	 */
+
 
 	/*
-	 *	The netlink device handler may be needed early.
+	 * The netlink device handler may be needed early.
 	 */
 
 #ifdef  CONFIG_RTNETLINK