Module Name: src
Committed By: martin
Date: Sat Jun 7 09:34:02 UTC 2014
Modified Files:
src/sys/net: if_fddisubr.c
Log Message:
Try to untangle the ifdef mess a bit more
To generate a diff of this commit:
cvs rdiff -u -r1.87 -r1.88 src/sys/net/if_fddisubr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if_fddisubr.c
diff -u src/sys/net/if_fddisubr.c:1.87 src/sys/net/if_fddisubr.c:1.88
--- src/sys/net/if_fddisubr.c:1.87 Fri Jun 6 00:25:28 2014
+++ src/sys/net/if_fddisubr.c Sat Jun 7 09:34:02 2014
@@ -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 @@ fddi_input(struct ifnet *ifp, struct mbu
#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 @@ fddi_input(struct ifnet *ifp, struct mbu
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);
