diff options
| author | dg <dg@FreeBSD.org> | 1994-11-30 12:08:23 +0000 |
|---|---|---|
| committer | dg <dg@FreeBSD.org> | 1994-11-30 12:08:23 +0000 |
| commit | 74d1e69716506e21b0833b416213a2cea603a074 (patch) | |
| tree | 99c0b62d753b54246adad3df4e4cfe73a084395b | |
| parent | be31fe948fd9e87951ce0b06efd3d64f3400c10c (diff) | |
| download | FreeBSD-src-74d1e69716506e21b0833b416213a2cea603a074.zip FreeBSD-src-74d1e69716506e21b0833b416213a2cea603a074.tar.gz | |
Fix bug I introduced that broke BPF support. Caused by a byte order problem
in an if () expression. Problem fixed by removing the test for ETHERTYPE_*
before passing packet to higher layers.
| -rw-r--r-- | sys/dev/de/if_de.c | 4 | ||||
| -rw-r--r-- | sys/i386/pci/if_de.c | 4 | ||||
| -rw-r--r-- | sys/pci/if_de.c | 4 |
3 files changed, 3 insertions, 9 deletions
diff --git a/sys/dev/de/if_de.c b/sys/dev/de/if_de.c index c2be075..d8c2038 100644 --- a/sys/dev/de/if_de.c +++ b/sys/dev/de/if_de.c @@ -21,7 +21,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: if_de.c,v 1.7 1994/11/22 09:47:31 davidg Exp $ + * $Id: if_de.c,v 1.8 1994/11/24 14:29:34 davidg Exp $ * */ @@ -397,8 +397,6 @@ tulip_rx_intr( #if NBPFILTER > 0 if (sc->tulip_bpf != NULL) { bpf_tap(sc->tulip_bpf, bufaddr, total_len); - if (eh.ether_type != ETHERTYPE_IP && eh.ether_type != ETHERTYPE_ARP) - goto next; if ((eh.ether_dhost[0] & 1) == 0 && !TULIP_ADDREQUAL(eh.ether_dhost, sc->tulip_ac.ac_enaddr)) goto next; diff --git a/sys/i386/pci/if_de.c b/sys/i386/pci/if_de.c index c2be075..d8c2038 100644 --- a/sys/i386/pci/if_de.c +++ b/sys/i386/pci/if_de.c @@ -21,7 +21,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: if_de.c,v 1.7 1994/11/22 09:47:31 davidg Exp $ + * $Id: if_de.c,v 1.8 1994/11/24 14:29:34 davidg Exp $ * */ @@ -397,8 +397,6 @@ tulip_rx_intr( #if NBPFILTER > 0 if (sc->tulip_bpf != NULL) { bpf_tap(sc->tulip_bpf, bufaddr, total_len); - if (eh.ether_type != ETHERTYPE_IP && eh.ether_type != ETHERTYPE_ARP) - goto next; if ((eh.ether_dhost[0] & 1) == 0 && !TULIP_ADDREQUAL(eh.ether_dhost, sc->tulip_ac.ac_enaddr)) goto next; diff --git a/sys/pci/if_de.c b/sys/pci/if_de.c index c2be075..d8c2038 100644 --- a/sys/pci/if_de.c +++ b/sys/pci/if_de.c @@ -21,7 +21,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: if_de.c,v 1.7 1994/11/22 09:47:31 davidg Exp $ + * $Id: if_de.c,v 1.8 1994/11/24 14:29:34 davidg Exp $ * */ @@ -397,8 +397,6 @@ tulip_rx_intr( #if NBPFILTER > 0 if (sc->tulip_bpf != NULL) { bpf_tap(sc->tulip_bpf, bufaddr, total_len); - if (eh.ether_type != ETHERTYPE_IP && eh.ether_type != ETHERTYPE_ARP) - goto next; if ((eh.ether_dhost[0] & 1) == 0 && !TULIP_ADDREQUAL(eh.ether_dhost, sc->tulip_ac.ac_enaddr)) goto next; |
