[src/trunk]: src/sys/net Remove leftover DECNET-related stuffs

[ozaki-r <ozaki-r%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/857b52602b13
branches:  trunk
changeset: 338449:857b52602b13
user:      ozaki-r <ozaki-r%NetBSD.org@localhost>
date:      Mon May 25 08:31:34 2015 +0000

description:
Remove leftover DECNET-related stuffs

No objection on tech-kern and tech-net.

diffstat:

 sys/net/if_fddisubr.c  |  24 +++++++-----------------
 sys/net/if_tokensubr.c |  20 +++++---------------
 2 files changed, 12 insertions(+), 32 deletions(-)

diffs (153 lines):

diff -r a26f5372ba4a -r 857b52602b13 sys/net/if_fddisubr.c
--- a/sys/net/if_fddisubr.c     Mon May 25 08:29:01 2015 +0000
+++ b/sys/net/if_fddisubr.c     Mon May 25 08:31:34 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_fddisubr.c,v 1.90 2015/05/25 08:29:01 ozaki-r Exp $ */
+/*     $NetBSD: if_fddisubr.c,v 1.91 2015/05/25 08:31:34 ozaki-r Exp $ */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -96,7 +96,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_fddisubr.c,v 1.90 2015/05/25 08:29:01 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_fddisubr.c,v 1.91 2015/05/25 08:31:34 ozaki-r Exp $");
 
 #include "opt_gateway.h"
 #include "opt_inet.h"
@@ -148,10 +148,6 @@
 #include <netinet/ip_carp.h>
 #endif
 
-#ifdef DECNET
-#include <netdnet/dn.h>
-#endif
-
 #ifdef NETATALK
 #include <netatalk/at.h>
 #include <netatalk/at_var.h>
@@ -446,7 +442,7 @@
 #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 @@
 
        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 @@
 
                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 @@
                        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 @@
 
        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 @@
                return;
        }
 #endif
-#if defined(DECNET) || defined(NETATALK)
+#if defined(NETATALK)
        if (!inq) {
                m_freem(m);
        }
diff -r a26f5372ba4a -r 857b52602b13 sys/net/if_tokensubr.c
--- a/sys/net/if_tokensubr.c    Mon May 25 08:29:01 2015 +0000
+++ b/sys/net/if_tokensubr.c    Mon May 25 08:31:34 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_tokensubr.c,v 1.67 2015/05/20 09:17:18 ozaki-r Exp $        */
+/*     $NetBSD: if_tokensubr.c,v 1.68 2015/05/25 08:31:34 ozaki-r Exp $        */
 
 /*
  * Copyright (c) 1982, 1989, 1993
@@ -92,7 +92,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tokensubr.c,v 1.67 2015/05/20 09:17:18 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tokensubr.c,v 1.68 2015/05/25 08:31:34 ozaki-r Exp $");
 
 #include "opt_inet.h"
 #include "opt_atalk.h"
@@ -135,10 +135,6 @@
 #include <netinet/ip_carp.h>
 #endif
 
-#ifdef DECNET
-#include <netdnet/dn.h>
-#endif
-
 #define senderr(e) { error = (e); goto bad;}
 
 #if defined(__bsdi__) || defined(__NetBSD__)
@@ -451,7 +447,7 @@
        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 @@
                        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 @@
                }
                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);