[src/netbsd-1-5]: src/sys/dev/ic Pull up rev. 1.70:

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

details:   https://anonhg.NetBSD.org/src/rev/d651dfba17c1
branches:  netbsd-1-5
changeset: 488427:d651dfba17c1
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Tue Jul 04 04:22:05 2000 +0000

description:
Pull up rev. 1.70:
Remove work-around for Lite-On PNIC in tlp_filter_setup() that is
apparently no longer necessary (probably due to other fixes that
have happened in the filter setup path) and is in fact harmful.

Based on a patch from Krister Walfridsson, who claims this makes
his newer NetGear FA-310TX work (although, my older NetGear FA-310TX
still does not, but fails in an entirely different way).

diffstat:

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

diffs (37 lines):

diff -r 2b0f4d8ac1eb -r d651dfba17c1 sys/dev/ic/tulip.c
--- a/sys/dev/ic/tulip.c        Tue Jul 04 04:11:12 2000 +0000
+++ b/sys/dev/ic/tulip.c        Tue Jul 04 04:22:05 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tulip.c,v 1.68 2000/05/26 16:38:13 thorpej Exp $       */
+/*     $NetBSD: tulip.c,v 1.68.4.1 2000/07/04 04:22:05 thorpej Exp $   */
 
 /*-
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -2555,25 +2555,8 @@
         * writing OPMODE will start the transmit and receive processes
         * in motion.
         */
-       if (ifp->if_flags & IFF_RUNNING) {
-               /*
-                * Actually, some chips seem to need a really hard
-                * kick in the head for this to work.  The genuine
-                * DEC chips can just be idled, but some of the
-                * clones seem to REALLY want a reset here.  Doing
-                * the reset will end up here again, but with
-                * IFF_RUNNING cleared.
-                */
-               switch (sc->sc_chip) {
-               case TULIP_CHIP_82C168:
-               case TULIP_CHIP_82C169:
-                       tlp_init(sc);
-                       return;
-
-               default:
-                       tlp_idle(sc, OPMODE_ST|OPMODE_SR);
-               }
-       }
+       if (ifp->if_flags & IFF_RUNNING)
+               tlp_idle(sc, OPMODE_ST|OPMODE_SR);
 
        sc->sc_opmode &= ~(OPMODE_PR|OPMODE_PM);