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

Cosmetic: KNF. Litter the code with fewer #if NBPFILTER > 0.

This commit is contained in:
dyoung 2007-10-05 05:15:58 +00:00
parent 944a024048
commit 32fddb3293
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sys/net/if_gre.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_gre.c,v 1.112 2007/10/05 04:55:10 dyoung Exp $ */ /* $NetBSD: if_gre.c,v 1.113 2007/10/05 05:15:58 dyoung Exp $ */
/* /*
* Copyright (c) 1998 The NetBSD Foundation, Inc. * Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -47,7 +47,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_gre.c,v 1.112 2007/10/05 04:55:10 dyoung Exp $"); __KERNEL_RCSID(0, "$NetBSD: if_gre.c,v 1.113 2007/10/05 05:15:58 dyoung Exp $");
#include "opt_gre.h" #include "opt_gre.h"
#include "opt_inet.h" #include "opt_inet.h"
@ -445,7 +445,6 @@ gre_upcall_add(struct socket *so, void *arg)
static void static void
gre_upcall_remove(struct socket *so) gre_upcall_remove(struct socket *so)
{ {
/* XXX What if the kernel already set an upcall? */
so->so_rcv.sb_flags &= ~SB_UPCALL; so->so_rcv.sb_flags &= ~SB_UPCALL;
so->so_upcallarg = NULL; so->so_upcallarg = NULL;
so->so_upcall = NULL; so->so_upcall = NULL;
@ -902,9 +901,7 @@ gre_input(struct gre_softc *sc, struct mbuf *m, int hlen,
const struct gre_h *gh) const struct gre_h *gh)
{ {
u_int16_t flags; u_int16_t flags;
#if NBPFILTER > 0 u_int32_t af; /* af passed to BPF tap */
u_int32_t af = AF_INET; /* af passed to BPF tap */
#endif
int isr, s; int isr, s;
struct ifqueue *ifq; struct ifqueue *ifq;
@ -933,23 +930,20 @@ gre_input(struct gre_softc *sc, struct mbuf *m, int hlen,
case ETHERTYPE_IP: case ETHERTYPE_IP:
ifq = &ipintrq; ifq = &ipintrq;
isr = NETISR_IP; isr = NETISR_IP;
af = AF_INET;
break; break;
#ifdef NETATALK #ifdef NETATALK
case ETHERTYPE_ATALK: case ETHERTYPE_ATALK:
ifq = &atintrq1; ifq = &atintrq1;
isr = NETISR_ATALK; isr = NETISR_ATALK;
#if NBPFILTER > 0
af = AF_APPLETALK; af = AF_APPLETALK;
#endif
break; break;
#endif #endif
#ifdef INET6 #ifdef INET6
case ETHERTYPE_IPV6: case ETHERTYPE_IPV6:
ifq = &ip6intrq; ifq = &ip6intrq;
isr = NETISR_IPV6; isr = NETISR_IPV6;
#if NBPFILTER > 0
af = AF_INET6; af = AF_INET6;
#endif
break; break;
#endif #endif
default: /* others not yet supported */ default: /* others not yet supported */
@ -1008,8 +1002,8 @@ gre_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst,
goto end; goto end;
} }
#if NBPFILTER >0 #if NBPFILTER > 0
if (ifp->if_bpf) if (ifp->if_bpf != NULL)
bpf_mtap_af(ifp->if_bpf, dst->sa_family, m); bpf_mtap_af(ifp->if_bpf, dst->sa_family, m);
#endif #endif