summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorJason Wright <jason@cvs.openbsd.org>1999-03-01 20:45:11 +0000
committerJason Wright <jason@cvs.openbsd.org>1999-03-01 20:45:11 +0000
commit0d42240cec1790f164df0e96aad941eba6156536 (patch)
treea7b8221182b9bcc7eb1ac2bef4d3ecebe02d3e73 /sys/arch
parentae38941d9fb3badfdbb2fd2ec7b689cb0462e959 (diff)
add checks for if_bridge (in addition to if_bpf)
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/sparc/dev/if_ie.c16
1 files changed, 11 insertions, 5 deletions
diff --git a/sys/arch/sparc/dev/if_ie.c b/sys/arch/sparc/dev/if_ie.c
index 64fb8b566e0..9fdaaa1b8d4 100644
--- a/sys/arch/sparc/dev/if_ie.c
+++ b/sys/arch/sparc/dev/if_ie.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ie.c,v 1.8 1999/01/11 05:11:55 millert Exp $ */
+/* $OpenBSD: if_ie.c,v 1.9 1999/03/01 20:45:10 jason Exp $ */
/* $NetBSD: if_ie.c,v 1.33 1997/07/29 17:55:38 fair Exp $ */
/*-
@@ -940,13 +940,16 @@ check_eh(sc, eh, to_bpf)
* Receiving all packets. These need to be passed on to BPF.
*/
#if NBPFILTER > 0
- *to_bpf = (sc->sc_arpcom.ac_if.if_bpf != 0);
+ *to_bpf = (sc->sc_arpcom.ac_if.if_bpf != 0) ||
+ (sc->sc_arpcom.ac_if.if_bridge != NULL);
+#else
+ *to_bpf = (sc->sc_arpcom.ac_if.if_bridge != NULL);
#endif
/* If for us, accept and hand up to BPF */
if (ether_equal(eh->ether_dhost, sc->sc_arpcom.ac_enaddr)) return 1;
#if NBPFILTER > 0
- if (*to_bpf)
+ if (*to_bpf && sc->sc_arpcom.ac_if.if_bridge == NULL)
*to_bpf = 2; /* we don't need to see it */
#endif
@@ -977,7 +980,10 @@ check_eh(sc, eh, to_bpf)
* time. Whew! (Hope this is a fast machine...)
*/
#if NBPFILTER > 0
- *to_bpf = (sc->sc_arpcom.ac_if.if_bpf != 0);
+ *to_bpf = (sc->sc_arpcom.ac_if.if_bpf != 0) ||
+ (sc->sc_arpcom.ac_if.if_bridge != NULL);
+#else
+ *to_bpf = (sc->sc_arpcom.ac_if.if_bridge != 0);
#endif
/* We want to see multicasts. */
if (eh->ether_dhost[0] & 1)
@@ -989,7 +995,7 @@ check_eh(sc, eh, to_bpf)
/* Anything else goes to BPF but nothing else. */
#if NBPFILTER > 0
- if (*to_bpf)
+ if (*to_bpf && sc->sc_arpcom.ac_if.if_bridge == NULL)
*to_bpf = 2;
#endif
return 1;