Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Try to untangle the ifdef mess a bit more

This commit is contained in:
martin 2014-06-07 09:34:02 +00:00
parent 83acbdf28c
commit db893a74ff
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/net/if_fddisubr.c
View File

@ -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 mbuf *m)
#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 mbuf *m)
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);