summaryrefslogtreecommitdiff
path: root/sys/net/if_spppsubr.c
diff options
context:
space:
mode:
authorHenning Brauer <henning@cvs.openbsd.org>2004-07-16 15:01:10 +0000
committerHenning Brauer <henning@cvs.openbsd.org>2004-07-16 15:01:10 +0000
commit7cffd1370ee5a668e1f416017a806f6298dfbdf8 (patch)
tree2fbcdb2611e425398ee8ab523856225643c299e9 /sys/net/if_spppsubr.c
parent3a0746f02ab0c6a1a7131d5d393402e088bd7b44 (diff)
remove netiso shitz, millert ok
Diffstat (limited to 'sys/net/if_spppsubr.c')
-rw-r--r--sys/net/if_spppsubr.c26
1 files changed, 1 insertions, 25 deletions
diff --git a/sys/net/if_spppsubr.c b/sys/net/if_spppsubr.c
index a6c1d48dd20..44e9b912818 100644
--- a/sys/net/if_spppsubr.c
+++ b/sys/net/if_spppsubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_spppsubr.c,v 1.23 2004/06/24 19:35:25 tholo Exp $ */
+/* $OpenBSD: if_spppsubr.c,v 1.24 2004/07/16 15:01:09 henning Exp $ */
/*
* Synchronous PPP/Cisco link level subroutines.
* Keepalive protocol implemented in both Cisco and PPP modes.
@@ -104,13 +104,6 @@
#include <netns/ns_if.h>
#endif
-#ifdef ISO
-#include <netiso/argo_debug.h>
-#include <netiso/iso.h>
-#include <netiso/iso_var.h>
-#include <netiso/iso_snpac.h>
-#endif
-
#include <net/if_sppp.h>
#if defined (__FreeBSD__)
@@ -562,15 +555,6 @@ sppp_input(struct ifnet *ifp, struct mbuf *m)
}
break;
#endif
-#ifdef ISO
- case PPP_ISO:
- /* OSI NLCP not implemented yet */
- if (sp->pp_phase == PHASE_NETWORK) {
- schednetisr (NETISR_ISO);
- inq = &clnlintrq;
- }
- break;
-#endif
}
break;
case CISCO_MULTICAST:
@@ -776,14 +760,6 @@ sppp_output(struct ifnet *ifp, struct mbuf *m,
ETHERTYPE_IPX : PPP_IPX);
break;
#endif
-#ifdef ISO
- case AF_ISO: /* ISO OSI Protocol */
- if (sp->pp_flags & PP_CISCO)
- goto nosupport;
- h->protocol = htons (PPP_ISO);
- break;
-nosupport:
-#endif
default:
m_freem (m);
++ifp->if_oerrors;