summaryrefslogtreecommitdiff
path: root/sys/net/if_fddisubr.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/net/if_fddisubr.c')
-rw-r--r--sys/net/if_fddisubr.c39
1 files changed, 3 insertions, 36 deletions
diff --git a/sys/net/if_fddisubr.c b/sys/net/if_fddisubr.c
index 0dacbe01374..35ab478e5e7 100644
--- a/sys/net/if_fddisubr.c
+++ b/sys/net/if_fddisubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_fddisubr.c,v 1.45 2005/06/07 02:45:11 henning Exp $ */
+/* $OpenBSD: if_fddisubr.c,v 1.46 2005/06/08 06:55:33 henning Exp $ */
/* $NetBSD: if_fddisubr.c,v 1.5 1996/05/07 23:20:21 christos Exp $ */
/*
@@ -114,15 +114,6 @@
#include <netinet6/nd6.h>
#endif
-#ifdef NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-#endif
-
-#ifdef DECNET
-#include <netdnet/dn.h>
-#endif
-
#include "bpfilter.h"
#include "carp.h"
@@ -259,18 +250,6 @@ fddi_output(ifp0, m0, dst, rt0)
mcopy = m_copy(m, 0, (int)M_COPYALL);
break;
#endif
-#ifdef NS
- case AF_NS:
- type = htons(ETHERTYPE_NS);
- bcopy((caddr_t)&(((struct sockaddr_ns *)dst)->sns_addr.x_host),
- (caddr_t)edst, sizeof (edst));
- if (!bcmp((caddr_t)edst, (caddr_t)&ns_thishost, sizeof(edst)))
- return (looutput(ifp, m, dst, rt));
- /* If broadcasting on a simplex interface, loopback a copy */
- if ((m->m_flags & M_BCAST) && (ifp->if_flags & IFF_SIMPLEX))
- mcopy = m_copy(m, 0, (int)M_COPYALL);
- break;
-#endif
case pseudo_AF_HDRCMPLT:
{
@@ -433,7 +412,7 @@ fddi_input(ifp, fh, m)
l = mtod(m, struct llc *);
switch (l->llc_dsap) {
-#if defined(INET) || defined(IPX) || defined(NS) || defined(DECNET) || defined(INET6)
+#if defined(INET) || defined(IPX) || defined(INET6)
case LLC_SNAP_LSAP:
{
u_int16_t etype;
@@ -477,18 +456,6 @@ fddi_input(ifp, fh, m)
inq = &ipxintrq;
break;
#endif
-#ifdef NS
- case ETHERTYPE_NS:
- schednetisr(NETISR_NS);
- inq = &nsintrq;
- break;
-#endif
-#ifdef DECNET
- case ETHERTYPE_DECNET:
- schednetisr(NETISR_DECNET);
- inq = &decnetintrq;
- break;
-#endif
default:
/* printf("fddi_input: unknown protocol 0x%x\n", etype); */
ifp->if_noproto++;
@@ -496,7 +463,7 @@ fddi_input(ifp, fh, m)
}
break;
}
-#endif /* INET || IPX || NS || DECNET */
+#endif /* INET || IPX || INET6 */
default:
/* printf("fddi_input: unknown dsap 0x%x\n", l->llc_dsap); */