[src/trunk]: src/sys/net Try to untangle the ifdef mess a bit more

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/281e3b73fb7f
branches:  trunk
changeset: 329756:281e3b73fb7f
user:      martin <martin%NetBSD.org@localhost>
date:      Sat Jun 07 09:34:02 2014 +0000

description:
Try to untangle the ifdef mess a bit more

diffstat:

 sys/net/if_fddisubr.c |  13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diffs (48 lines):

diff -r bf478e891e82 -r 281e3b73fb7f sys/net/if_fddisubr.c
--- a/sys/net/if_fddisubr.c     Sat Jun 07 06:02:27 2014 +0000
+++ b/sys/net/if_fddisubr.c     Sat Jun 07 09:34:02 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_fddisubr.c,v 1.87 2014/06/06 00:25:28 rmind Exp $   */
+/*     $NetBSD: if_fddisubr.c,v 1.88 2014/06/07 09:34:02 martin 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.87 2014/06/06 00:25:28 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_fddisubr.c,v 1.88 2014/06/07 09:34:02 martin Exp $");
 
 #include "opt_gateway.h"
 #include "opt_inet.h"
@@ -462,13 +462,16 @@
 #if defined(INET) || defined(INET6)
        pktqueue_t *pktq = NULL;
 #endif
-#if defined(INET) || defined(INET6) || defined(NS) || defined(DECNET) || defined(IPX) || defined(NETATALK)
+#if defined(NS) || defined(DECNET) || defined(IPX) || defined(NETATALK)
        struct ifqueue *inq = NULL;
+#endif
+#if defined(NS) || defined(DECNET) || defined(IPX) || defined(NETATALK)
+       int isr = 0;
        int s;
 #endif
+
        struct llc *l;
        struct fddi_header *fh;
-       int isr = 0;
 
        MCLAIM(m, &((struct ethercom *)ifp)->ec_rx_mowner);
        if ((ifp->if_flags & IFF_UP) == 0) {
@@ -556,8 +559,10 @@
 
                case ETHERTYPE_ARP:
 #if !defined(__bsdi__) || _BSDI_VERSION >= 199401
+#if defined(NS) || defined(DECNET) || defined(IPX) || defined(NETATALK)
                        isr = NETISR_ARP;
                        inq = &arpintrq;
+#endif
                        break;
 #else
                        arpinput(ifp, m);