[src/netbsd-1-6]: src/sys/arch/macppc/dev Pull up revisions 1.14 (requested b...

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

details:   https://anonhg.NetBSD.org/src/rev/e903b2b32972
branches:  netbsd-1-6
changeset: 530328:e903b2b32972
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Tue Jun 17 09:28:02 2003 +0000

description:
Pull up revisions 1.14 (requested by Ben Harris in ticket #1314):
 Don't bring down mc(4) interfaces when they underflow.
 Fixes PR#12088.

diffstat:

 sys/arch/macppc/dev/am79c950.c |  12 ++----------
 1 files changed, 2 insertions(+), 10 deletions(-)

diffs (59 lines):

diff -r 4996b82b7dd1 -r e903b2b32972 sys/arch/macppc/dev/am79c950.c
--- a/sys/arch/macppc/dev/am79c950.c    Tue Jun 17 09:27:08 2003 +0000
+++ b/sys/arch/macppc/dev/am79c950.c    Tue Jun 17 09:28:02 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: am79c950.c,v 1.12 2002/01/16 06:04:23 thorpej Exp $    */
+/*     $NetBSD: am79c950.c,v 1.12.10.1 2003/06/17 09:28:02 msaitoh Exp $       */
 
 /*-
  * Copyright (c) 1997 David Huang <khym%bga.com@localhost>
@@ -200,7 +200,6 @@
        struct ifreq *ifr;
 
        int     s = splnet(), err = 0;
-       int     temp;
 
        switch (cmd) {
 
@@ -259,9 +258,7 @@
                         * reset the interface to pick up any other changes
                         * in flags
                         */
-                       temp = ifp->if_flags & IFF_UP;
                        mcreset(sc);
-                       ifp->if_flags |= temp;
                        mcstart(ifp);
                }
                break;
@@ -278,9 +275,7 @@
                         * Multicast list has changed; set the hardware
                         * filter accordingly. But remember UP flag!
                         */
-                       temp = ifp->if_flags & IFF_UP;
                        mcreset(sc);
-                       ifp->if_flags |= temp;
                        err = 0;
                }
                break;
@@ -434,7 +429,7 @@
        DELAY(100);
 
        sc->sc_if.if_timer = 0;
-       sc->sc_if.if_flags &= ~(IFF_RUNNING | IFF_UP);
+       sc->sc_if.if_flags &= ~IFF_RUNNING;
 
        splx(s);
        return (0);
@@ -450,12 +445,9 @@
        struct ifnet *ifp;
 {
        struct mc_softc *sc = ifp->if_softc;
-       int temp;
 
        printf("mcwatchdog: resetting chip\n");
-       temp = ifp->if_flags & IFF_UP;
        mcreset(sc);
-       ifp->if_flags |= temp;
 }
 
 /*