summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenning Brauer <henning@cvs.openbsd.org>2007-06-06 09:58:13 +0000
committerHenning Brauer <henning@cvs.openbsd.org>2007-06-06 09:58:13 +0000
commit32538e4e3dceb6bd9ac623e8a697eecbec0058c2 (patch)
treefc73b7aba3e9295a3ef2804afc7b893fbacfcda0
parent043ddf5455ca568b713f247107c8c0845e32fdd0 (diff)
remove ifdef'd out ipx-in-ip registration
-rw-r--r--sys/netinet/in_proto.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/sys/netinet/in_proto.c b/sys/netinet/in_proto.c
index be9a9a8bb0c..924630dc039 100644
--- a/sys/netinet/in_proto.c
+++ b/sys/netinet/in_proto.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: in_proto.c,v 1.45 2005/12/23 13:01:23 claudio Exp $ */
+/* $OpenBSD: in_proto.c,v 1.46 2007/06/06 09:58:12 henning Exp $ */
/* $NetBSD: in_proto.c,v 1.14 1996/02/18 18:58:32 christos Exp $ */
/*
@@ -143,11 +143,6 @@
#include <netinet/in_gif.h>
#endif
-#ifdef IPXIP
-#include <netipx/ipx.h>
-#include <netipx/ipx_ip.h>
-#endif /* IPXIP */
-
#ifdef INET6
#include <netinet6/ip6_var.h>
#endif /* INET6 */
@@ -243,13 +238,6 @@ struct protosw inetsw[] = {
0, 0, 0, 0,
},
#endif /* PIM */
-#ifdef IPXIP
-{ SOCK_RAW, &inetdomain, IPPROTO_IDP, PR_ATOMIC|PR_ADDR,
- ipxip_input, rip_output, ipxip_ctlinput, 0,
- rip_usrreq,
- ipxipprotoinit,0, 0, 0,
-},
-#endif /* IPXIP */
#ifdef IPSEC
{ SOCK_RAW, &inetdomain, IPPROTO_AH, PR_ATOMIC|PR_ADDR,
ah4_input, rip_output, ah4_ctlinput, rip_ctloutput,