summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/net/if_ethersubr.c40
-rw-r--r--sys/net/if_fddisubr.c39
-rw-r--r--sys/net/if_spppsubr.c28
-rw-r--r--sys/net/if_tokensubr.c40
4 files changed, 8 insertions, 139 deletions
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
index e4995d3ffb8..e7a5b620944 100644
--- a/sys/net/if_ethersubr.c
+++ b/sys/net/if_ethersubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ethersubr.c,v 1.95 2005/06/07 07:09:42 camield Exp $ */
+/* $OpenBSD: if_ethersubr.c,v 1.96 2005/06/08 06:55:33 henning Exp $ */
/* $NetBSD: if_ethersubr.c,v 1.19 1996/05/07 02:40:30 thorpej Exp $ */
/*
@@ -141,11 +141,6 @@ didn't get a copy, you may request one from <license@ipv6.nrl.navy.mil>.
#include <netinet6/nd6.h>
#endif
-#ifdef NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-#endif
-
#ifdef IPX
#include <netipx/ipx.h>
#include <netipx/ipx_if.h>
@@ -198,21 +193,6 @@ ether_ioctl(ifp, arp, cmd, data)
/* Nothing to do. */
break;
#endif /* NETATALK */
-#ifdef NS
- /* XXX - This code is probably wrong. */
- case AF_NS:
- {
- struct ns_addr *ina = &IA_SNS(ifa)->sns_addr;
-
- if (ns_nullhost(*ina))
- ina->x_host =
- *(union ns_host *)(arp->ac_enaddr);
- else
- bcopy(ina->x_host.c_host,
- arp->ac_enaddr, sizeof(arp->ac_enaddr));
- break;
- }
-#endif /* NS */
}
break;
default:
@@ -314,18 +294,6 @@ ether_output(ifp0, m0, dst, rt0)
etype = htons(ETHERTYPE_IPV6);
break;
#endif
-#ifdef NS
- case AF_NS:
- etype = 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
#ifdef IPX
case AF_IPX:
etype = htons(ETHERTYPE_IPX);
@@ -715,12 +683,6 @@ decapsulate:
inq = &ipxintrq;
break;
#endif
-#ifdef NS
- case ETHERTYPE_NS:
- schednetisr(NETISR_NS);
- inq = &nsintrq;
- break;
-#endif
#ifdef NETATALK
case ETHERTYPE_AT:
schednetisr(NETISR_ATALK);
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); */
diff --git a/sys/net/if_spppsubr.c b/sys/net/if_spppsubr.c
index b238191775e..99c23d68e13 100644
--- a/sys/net/if_spppsubr.c
+++ b/sys/net/if_spppsubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_spppsubr.c,v 1.33 2005/05/13 20:17:02 brad Exp $ */
+/* $OpenBSD: if_spppsubr.c,v 1.34 2005/06/08 06:55:33 henning Exp $ */
/*
* Synchronous PPP/Cisco link level subroutines.
* Keepalive protocol implemented in both Cisco and PPP modes.
@@ -99,11 +99,6 @@
#include <netipx/ipx_if.h>
#endif
-#ifdef NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-#endif
-
#include <net/if_sppp.h>
#if defined (__FreeBSD__)
@@ -563,15 +558,6 @@ sppp_input(struct ifnet *ifp, struct mbuf *m)
}
break;
#endif
-#ifdef NS
- case PPP_XNS:
- /* XNS IDPCP not implemented yet */
- if (sp->pp_phase == PHASE_NETWORK) {
- schednetisr (NETISR_NS);
- inq = &nsintrq;
- }
- break;
-#endif
}
break;
case CISCO_MULTICAST:
@@ -606,12 +592,6 @@ sppp_input(struct ifnet *ifp, struct mbuf *m)
inq = &ipxintrq;
break;
#endif
-#ifdef NS
- case ETHERTYPE_NS:
- schednetisr (NETISR_NS);
- inq = &nsintrq;
- break;
-#endif
}
break;
default: /* Invalid PPP packet. */
@@ -779,12 +759,6 @@ sppp_output(struct ifnet *ifp, struct mbuf *m,
}
break;
#endif
-#ifdef NS
- case AF_NS: /* Xerox NS Protocol */
- protocol = htons ((sp->pp_flags & PP_CISCO) ?
- ETHERTYPE_NS : PPP_XNS);
- break;
-#endif
#ifdef IPX
case AF_IPX: /* Novell IPX Protocol */
protocol = htons ((sp->pp_flags & PP_CISCO) ?
diff --git a/sys/net/if_tokensubr.c b/sys/net/if_tokensubr.c
index 02b56cf20c1..bfb3153af97 100644
--- a/sys/net/if_tokensubr.c
+++ b/sys/net/if_tokensubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_tokensubr.c,v 1.19 2005/06/07 02:45:11 henning Exp $ */
+/* $OpenBSD: if_tokensubr.c,v 1.20 2005/06/08 06:55:33 henning Exp $ */
/* $NetBSD: if_tokensubr.c,v 1.7 1999/05/30 00:39:07 bad Exp $ */
/*
@@ -63,15 +63,6 @@
#include <net/if_token.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"
@@ -275,19 +266,6 @@ token_output(ifp0, m0, dst, rt0)
break;
#endif /* 0 */
#endif
-#ifdef NS
- case AF_NS:
- etype = 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 AF_UNSPEC:
{
struct ether_header *eh;
@@ -439,7 +417,7 @@ token_input(ifp, m)
l = mtod(m, struct llc *);
switch (l->llc_dsap) {
-#if defined(INET) || defined(NS) || defined(DECNET)
+#if defined(INET)
case LLC_SNAP_LSAP:
{
u_int16_t etype;
@@ -471,18 +449,6 @@ token_input(ifp, m)
inq = &arpintrq;
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("token_input: unknown protocol 0x%x\n", etype);
@@ -492,7 +458,7 @@ token_input(ifp, m)
}
break;
}
-#endif /* INET || NS */
+#endif /* INET */
default:
/* printf("token_input: unknown dsap 0x%x\n", l->llc_dsap); */
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-15 20:27:40 +0000