[src/netbsd-1-5]: src/sys/dev/ic Pull up revision 1.85 (requested by thorpej):

[jhawk <jhawk%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/804174df88ed
branches:  netbsd-1-5
changeset: 490543:804174df88ed
user:      jhawk <jhawk%NetBSD.org@localhost>
date:      Fri Jan 26 01:03:50 2001 +0000

description:
Pull up revision 1.85 (requested by thorpej):
  Ignore recieve errors if VLAN_MTU is enabled.

diffstat:

 sys/dev/ic/tulip.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (20 lines):

diff -r 26fe83a4384d -r 804174df88ed sys/dev/ic/tulip.c
--- a/sys/dev/ic/tulip.c        Fri Jan 26 00:32:07 2001 +0000
+++ b/sys/dev/ic/tulip.c        Fri Jan 26 01:03:50 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tulip.c,v 1.68.4.4 2000/12/31 20:15:05 jhawk Exp $     */
+/*     $NetBSD: tulip.c,v 1.68.4.5 2001/01/26 01:03:50 jhawk Exp $     */
 
 /*-
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -1350,8 +1350,8 @@
                 */
                if (rxstat & TDSTAT_ES &&
                    ((sc->sc_ethercom.ec_capenable & ETHERCAP_VLAN_MTU) == 0 ||
-                   (rxstat & (TDSTAT_Rx_DE | TDSTAT_Rx_RF | TDSTAT_Rx_RE |
-                   TDSTAT_Rx_DB | TDSTAT_Rx_CE)) != 0)) {
+                    (rxstat & (TDSTAT_Rx_DE | TDSTAT_Rx_RF |
+                               TDSTAT_Rx_DB | TDSTAT_Rx_CE)) != 0)) {
 #define        PRINTERR(bit, str)                                              \
                        if (rxstat & (bit))                             \
                                printf("%s: receive error: %s\n",       \