patch-2.1.68 linux/net/protocols.c

Next file: linux/net/rose/af_rose.c
Previous file: linux/net/packet/af_packet.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.67/linux/net/protocols.c linux/net/protocols.c
@@ -10,8 +10,6 @@
 #include <linux/net.h>
 #include <linux/fs.h>
 
-#define CONFIG_UNIX		/* always present...	*/
-
 #ifdef	CONFIG_UNIX
 #include <linux/un.h>
 #include <net/af_unix.h>
@@ -24,6 +22,14 @@
 #endif
 #endif	/* INET */
 
+#ifdef CONFIG_NETLINK
+extern void netlink_proto_init(struct net_proto *pro);
+#endif
+
+#ifdef CONFIG_PACKET
+extern void packet_proto_init(struct net_proto *pro);
+#endif
+
 #if defined(CONFIG_IPX) || defined(CONFIG_IPX_MODULE)
 #define NEED_802
 #include <net/ipxcall.h>
@@ -61,6 +67,10 @@
 #include <net/netbeuicall.h>
 #endif
 
+#if defined(CONFIG_LLC)
+#define NEED_LLC
+#endif
+
 #include <net/psnapcall.h>
 
 #ifdef CONFIG_TR
@@ -84,6 +94,14 @@
  */
  
 struct net_proto protocols[] = {
+#ifdef  CONFIG_NETLINK
+  { "NETLINK",	netlink_proto_init	},
+#endif
+
+#ifdef  CONFIG_PACKET
+  { "PACKET",	packet_proto_init	},
+#endif
+
 #ifdef	CONFIG_UNIX
   { "UNIX",	unix_proto_init	},			/* Unix domain socket family 	*/
 #endif

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