diff options
| author | Mathieu Sauve-Frankel <msf@cvs.openbsd.org> | 2004-09-17 11:32:54 +0000 |
|---|---|---|
| committer | Mathieu Sauve-Frankel <msf@cvs.openbsd.org> | 2004-09-17 11:32:54 +0000 |
| commit | 354c96f10f5870589d658541e90244b3073c8ffd (patch) | |
| tree | d9fd39ba82fd55bfe2771ee68b6542b7aad416b2 /sys | |
| parent | 91a8ef67e336f14181f36b1b3c2746be9d616d68 (diff) | |
Remove option EON from kernel and options(4)
ok henning@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/i386/conf/DISKLESS | 4 | ||||
| -rw-r--r-- | sys/arch/sgi/conf/RAMDISK | 4 | ||||
| -rw-r--r-- | sys/netinet/in_proto.c | 14 |
3 files changed, 3 insertions, 19 deletions
diff --git a/sys/arch/i386/conf/DISKLESS b/sys/arch/i386/conf/DISKLESS index e6ea63037de..69c8cf40759 100644 --- a/sys/arch/i386/conf/DISKLESS +++ b/sys/arch/i386/conf/DISKLESS @@ -1,4 +1,4 @@ -# $OpenBSD: DISKLESS,v 1.53 2004/09/16 09:14:03 mickey Exp $ +# $OpenBSD: DISKLESS,v 1.54 2004/09/17 11:32:53 msf Exp $ # # DISKLESS -- Generic machine setup for diskless boot. # This kernel can be loaded from a bootable floppy (i.e. kernel-copy) @@ -91,8 +91,6 @@ option IPSEC # IPsec #option IPXIP # IPX tunneling over IP #option NETATALK # AppleTalk #option NSIP # XNS tunneling over IP -#option ISO,TPIP # OSI -#option EON # OSI tunneling over IP #option CCITT,LLC,HDLC # X.25 option PPP_BSDCOMP # PPP BSD compression option PPP_DEFLATE diff --git a/sys/arch/sgi/conf/RAMDISK b/sys/arch/sgi/conf/RAMDISK index 1a437851cf3..a9d07bd8f1d 100644 --- a/sys/arch/sgi/conf/RAMDISK +++ b/sys/arch/sgi/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.8 2004/09/16 09:14:04 mickey Exp $ +# $OpenBSD: RAMDISK,v 1.9 2004/09/17 11:32:53 msf Exp $ # machine sgi mips64 @@ -40,8 +40,6 @@ option NFSCLIENT # Sun NFS-compatible filesystem (client) option INET # Internet protocols #option NS # XNS #option IPX # IPX+SPX -#option ISO,TPIP # OSI networking -#option EON # OSI tunneling over IP # RAMDISK stuff option MINIROOTSIZE=8192 diff --git a/sys/netinet/in_proto.c b/sys/netinet/in_proto.c index ddd0ac87633..7197c5e6eee 100644 --- a/sys/netinet/in_proto.c +++ b/sys/netinet/in_proto.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in_proto.c,v 1.40 2004/07/17 13:24:58 henning Exp $ */ +/* $OpenBSD: in_proto.c,v 1.41 2004/09/17 11:32:53 msf Exp $ */ /* $NetBSD: in_proto.c,v 1.14 1996/02/18 18:58:32 christos Exp $ */ /* @@ -150,10 +150,6 @@ #include <netipx/ipx_ip.h> #endif /* NSIP */ -#ifdef EON -#include <netiso/eonvar.h> -#endif /* EON */ - #ifdef MROUTING #include <netinet/ip_mroute.h> #endif /* MROUTING */ @@ -246,14 +242,6 @@ struct protosw inetsw[] = { rip_usrreq, igmp_init, igmp_fasttimo, igmp_slowtimo, 0, }, -/* EON (ISO CLNL over IP) */ -#ifdef EON -{ SOCK_RAW, &inetdomain, IPPROTO_EON, 0, - eoninput, 0, eonctlinput, 0, - 0, - eonprotoinit, 0, 0, 0, -}, -#endif /* EON */ #ifdef IPXIP { SOCK_RAW, &inetdomain, IPPROTO_IDP, PR_ATOMIC|PR_ADDR, ipxip_input, rip_output, ipxip_ctlinput, 0, |