summaryrefslogtreecommitdiffstats
path: root/net/protocols.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1995-11-14 08:00:00 +0000
committer <ralf@linux-mips.org>1995-11-14 08:00:00 +0000
commite7c2a72e2680827d6a733931273a93461c0d8d1b (patch)
treec9abeda78ef7504062bb2e816bcf3e3c9d680112 /net/protocols.c
parentec6044459060a8c9ce7f64405c465d141898548c (diff)
Import of Linux/MIPS 1.3.0
Diffstat (limited to 'net/protocols.c')
-rw-r--r--net/protocols.c48
1 files changed, 37 insertions, 11 deletions
diff --git a/net/protocols.c b/net/protocols.c
index ba580aaa4..76def9857 100644
--- a/net/protocols.c
+++ b/net/protocols.c
@@ -13,38 +13,64 @@
#define CONFIG_UNIX /* always present... */
#ifdef CONFIG_UNIX
-#include "unix/unix.h"
+#include <net/unix.h>
#endif
#ifdef CONFIG_INET
#include <linux/inet.h>
#endif
#ifdef CONFIG_IPX
-#include "inet/ipxcall.h"
-#include "inet/p8022call.h"
+#include <net/ipxcall.h>
+#include <net/p8022call.h>
#endif
#ifdef CONFIG_AX25
-#include "inet/ax25call.h"
+#include <net/ax25call.h>
+#ifdef CONFIG_NETROM
+#include <net/nrcall.h>
+#endif
+#endif
+#ifdef CONFIG_ATALK
+#ifndef CONFIG_IPX
+#include <net/p8022call.h>
+#endif
+#include <net/atalkcall.h>
+#endif
+#include <net/psnapcall.h>
+#ifdef CONFIG_TR
+#include <linux/netdevice.h>
+#include <linux/trdevice.h>
+extern void rif_init(struct net_proto *);
#endif
-
/*
* Protocol Table
*/
struct net_proto protocols[] = {
#ifdef CONFIG_UNIX
- { "UNIX", unix_proto_init },
+ { "UNIX", unix_proto_init }, /* Unix domain socket family */
#endif
-#ifdef CONFIG_IPX
- { "IPX", ipx_proto_init },
- { "802.2", p8022_proto_init },
+#if defined(CONFIG_IPX)||defined(CONFIG_ATALK)
+ { "802.2", p8022_proto_init }, /* 802.2 demultiplexor */
+ { "SNAP", snap_proto_init }, /* SNAP demultiplexor */
#endif
+#ifdef CONFIG_TR
+ { "RIF", rif_init }, /* RIF for Token ring */
+#endif
#ifdef CONFIG_AX25
{ "AX.25", ax25_proto_init },
+#ifdef CONFIG_NETROM
+ { "NET/ROM", nr_proto_init },
+#endif
#endif
#ifdef CONFIG_INET
- { "INET", inet_proto_init },
+ { "INET", inet_proto_init }, /* TCP/IP */
+#endif
+#ifdef CONFIG_IPX
+ { "IPX", ipx_proto_init }, /* IPX */
+#endif
+#ifdef CONFIG_ATALK
+ { "DDP", atalk_proto_init }, /* Netatalk Appletalk driver */
#endif
- { NULL, NULL }
+ { NULL, NULL } /* End marker */
};