diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-12-16 05:34:03 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-12-16 05:34:03 +0000 |
| commit | 967c65a99059fd459b956c1588ce0ba227912c4e (patch) | |
| tree | 8224d013ff5d255420713d05610c7efebd204d2a /net/protocols.c | |
| parent | e20c1cc1656a66a2773bca4591a895cbc12696ff (diff) | |
Merge with Linux 2.1.72, part 1.
Diffstat (limited to 'net/protocols.c')
| -rw-r--r-- | net/protocols.c | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/net/protocols.c b/net/protocols.c index a0bb0a6b8..cba2a3ac4 100644 --- a/net/protocols.c +++ b/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 @@ extern void inet6_proto_init(struct net_proto *pro); #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 @@ extern void inet6_proto_init(struct net_proto *pro); #include <net/netbeuicall.h> #endif +#if defined(CONFIG_LLC) +#define NEED_LLC +#endif + #include <net/psnapcall.h> #ifdef CONFIG_TR @@ -84,6 +94,14 @@ extern void rif_init(struct net_proto *); */ 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 |