commit fb3f250af6719bc2ea1d081a2cd4056e80e222c6 Author: Ryota Ozaki Date: Fri May 22 15:21:06 2015 +0900 Remove leftover DECNET-related stuffs diff --git a/sys/net/if_fddisubr.c b/sys/net/if_fddisubr.c index ad83099..67fc1a7 100644 --- a/sys/net/if_fddisubr.c +++ b/sys/net/if_fddisubr.c @@ -148,10 +148,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_fddisubr.c,v 1.89 2015/05/20 09:17:18 ozaki-r Exp #include #endif -#ifdef DECNET -#include -#endif - #ifdef NETATALK #include #include @@ -446,7 +442,7 @@ fddi_input(struct ifnet *ifp, struct mbuf *m) #if defined(INET) || defined(INET6) pktqueue_t *pktq = NULL; #endif -#if defined(DECNET) || defined(NETATALK) +#if defined(NETATALK) struct ifqueue *inq = NULL; int isr = 0; int s; @@ -490,7 +486,7 @@ fddi_input(struct ifnet *ifp, struct mbuf *m) l = (struct llc *)(fh+1); switch (l->llc_dsap) { -#if defined(INET) || defined(INET6) || defined(DECNET) || defined(NETATALK) +#if defined(INET) || defined(INET6) || defined(NETATALK) case LLC_SNAP_LSAP: { uint16_t etype; @@ -541,7 +537,7 @@ fddi_input(struct ifnet *ifp, struct mbuf *m) case ETHERTYPE_ARP: #if !defined(__bsdi__) || _BSDI_VERSION >= 199401 -#if defined(DECNET) || defined(NETATALK) +#if defined(NETATALK) isr = NETISR_ARP; inq = &arpintrq; #endif @@ -561,12 +557,6 @@ fddi_input(struct ifnet *ifp, struct mbuf *m) break; #endif -#ifdef DECNET - case ETHERTYPE_DECNET: - isr = NETISR_DECNET; - inq = &decnetintrq; - break; -#endif #ifdef NETATALK case ETHERTYPE_ATALK: isr = NETISR_ATALK; @@ -587,7 +577,7 @@ fddi_input(struct ifnet *ifp, struct mbuf *m) default: ifp->if_noproto++; -#if defined(INET) || defined(INET6) || defined(DECNET) || defined(NETATALK) +#if defined(INET) || defined(INET6) || defined(NETATALK) dropanyway: #endif m_freem(m); @@ -602,7 +592,7 @@ fddi_input(struct ifnet *ifp, struct mbuf *m) return; } #endif -#if defined(DECNET) || defined(NETATALK) +#if defined(NETATALK) if (!inq) { m_freem(m); } diff --git a/sys/net/if_tokensubr.c b/sys/net/if_tokensubr.c index a4cbfb7..4cda10a 100644 --- a/sys/net/if_tokensubr.c +++ b/sys/net/if_tokensubr.c @@ -135,10 +135,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_tokensubr.c,v 1.67 2015/05/20 09:17:18 ozaki-r Ex #include #endif -#ifdef DECNET -#include -#endif - #define senderr(e) { error = (e); goto bad;} #if defined(__bsdi__) || defined(__NetBSD__) @@ -451,7 +447,7 @@ token_input(struct ifnet *ifp, struct mbuf *m) l = (struct llc *)(mtod(m, uint8_t *) + lan_hdr_len); switch (l->llc_dsap) { -#if defined(INET) || defined(DECNET) +#if defined(INET) case LLC_SNAP_LSAP: { uint16_t etype; @@ -481,12 +477,6 @@ token_input(struct ifnet *ifp, struct mbuf *m) inq = &arpintrq; break; #endif -#ifdef DECNET - case ETHERTYPE_DECNET: - isr = NETISR_DECNET; - inq = &decnetintrq; - break; -#endif default: /* printf("token_input: unknown protocol 0x%x\n", etype); @@ -496,12 +486,12 @@ token_input(struct ifnet *ifp, struct mbuf *m) } break; } -#endif /* INET || NS || DECNET */ +#endif /* INET */ default: /* printf("token_input: unknown dsap 0x%x\n", l->llc_dsap); */ ifp->if_noproto++; -#if defined(INET) || defined(DECNET) +#if defined(INET) dropanyway: #endif m_freem(m);