[src/netbsd-1-5]: src/sys/dev/isa Pull up rev. 1.38:

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

details:   https://anonhg.NetBSD.org/src/rev/5e9e0c81e8a9
branches:  netbsd-1-5
changeset: 488300:5e9e0c81e8a9
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Tue Jun 27 21:46:01 2000 +0000

description:
Pull up rev. 1.38:
s/sc->sc_ethercom.ec_if./ifp->/ where appropriate and formerly forgotten,
for better readability.

diffstat:

 sys/dev/isa/if_iy.c |  12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diffs (41 lines):

diff -r 923950c4c663 -r 5e9e0c81e8a9 sys/dev/isa/if_iy.c
--- a/sys/dev/isa/if_iy.c       Tue Jun 27 21:45:17 2000 +0000
+++ b/sys/dev/isa/if_iy.c       Tue Jun 27 21:46:01 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_iy.c,v 1.36.4.1 2000/06/27 21:45:17 thorpej Exp $   */
+/*     $NetBSD: if_iy.c,v 1.36.4.2 2000/06/27 21:46:01 thorpej Exp $   */
 /* #define IYDEBUG */
 /* #define IYMEMDEBUG */
 
@@ -968,8 +968,7 @@
                if ((ifp->if_flags & IFF_PROMISC) &&
                    (eh->ether_dhost[0] & 1) == 0 &&
                    bcmp(eh->ether_dhost,
-                       LLADDR(sc->sc_ethercom.ec_if.if_sadl), 
-                       sizeof(eh->ether_dhost)) != 0) {
+                       LLADDR(ifp->if_sadl), sizeof(eh->ether_dhost)) != 0) {
 
                        m_freem(top);
                        return;
@@ -1111,10 +1110,9 @@
 
                        if (ns_nullhost(*ina))
                                ina->x_host = *(union ns_host *)
-                                   LLADDR(sc->sc_ethercom.ec_if.if_sadl);
+                                   LLADDR(ifp->if_sadl);
                        else
-                               bcopy(ina->x_host.c_host,
-                                   LLADDR(sc->sc_ethercom.ec_if.if_sadl),
+                               bcopy(ina->x_host.c_host, LLADDR(ifp->if_sadl),
                                    ETHER_ADDR_LEN);
                        /* Set new address. */
                        iyinit(sc);
@@ -1304,7 +1302,7 @@
                break;
        }
        sc->tx_start = sc->tx_end;
-       sc->sc_ethercom.ec_if.if_flags &= ~IFF_OACTIVE;
+       ifp->if_flags &= ~IFF_OACTIVE;
        
 }