summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorbriggs <briggs@cvs.openbsd.org>1997-03-17 04:20:55 +0000
committerbriggs <briggs@cvs.openbsd.org>1997-03-17 04:20:55 +0000
commit806a1aa510b67c718a222c2c696daed9f919b819 (patch)
tree73be596a27ba377c2a4e4cc63fe0ee5a5c90a0db /sys
parent9b7aed6fd1912f905a2301bb1a264fb3cf9dad85 (diff)
A couple of cleanup items suggested by is@netbsd.org.
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/mac68k/dev/if_sn.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/sys/arch/mac68k/dev/if_sn.c b/sys/arch/mac68k/dev/if_sn.c
index f6c393c41b5..745c98a7878 100644
--- a/sys/arch/mac68k/dev/if_sn.c
+++ b/sys/arch/mac68k/dev/if_sn.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_sn.c,v 1.11 1997/03/17 04:04:32 briggs Exp $ */
+/* $OpenBSD: if_sn.c,v 1.12 1997/03/17 04:20:54 briggs Exp $ */
/*
* National Semiconductor SONIC Driver
@@ -331,7 +331,7 @@ outloop:
return;
}
- IF_DEQUEUE(&sc->sc_if.if_snd, m);
+ IF_DEQUEUE(&ifp->if_snd, m);
if (m == 0)
return;
@@ -344,8 +344,8 @@ outloop:
* If bpf is listening on this interface, let it
* see the packet before we commit it to the wire.
*/
- if (sc->sc_if.if_bpf)
- bpf_mtap(sc->sc_if.if_bpf, m);
+ if (ifp->if_bpf)
+ bpf_mtap(ifp->if_bpf, m);
#endif
/*
@@ -357,7 +357,7 @@ outloop:
len = m->m_pkthdr.len;
m_freem(m);
} else {
- IF_PREPEND(sc->sc_if.if_snd, m);
+ IF_PREPEND(ifp->if_snd, m);
return;
}
@@ -367,7 +367,7 @@ outloop:
sc->txb_inuse++;
- sc->sc_if.if_opackets++; /* # of pkts */
+ ifp->if_opackets++; /* # of pkts */
sc->sc_sum.ls_opacks++; /* # of pkts */
/* Jump back for possibly more punishment. */
@@ -513,9 +513,9 @@ snwatchdog(ifp)
else
log(LOG_ERR, "%s: Tx - lost interrupt\n",
sc->sc_dev.dv_xname);
- temp = sc->sc_if.if_flags & IFF_UP;
+ temp = ifp->if_flags & IFF_UP;
snreset(sc);
- sc->sc_if.if_flags |= temp;
+ ifp->if_flags |= temp;
}
}
@@ -1045,8 +1045,8 @@ sonic_read(sc, pkt, len)
* If so, hand off the raw packet to enet, then discard things
* not destined for us (but be sure to keep broadcast/multicast).
*/
- if (sc->sc_if.if_bpf) {
- bpf_tap(sc->sc_if.if_bpf, pkt,
+ if (ifp->if_bpf) {
+ bpf_tap(ifp->if_bpf, pkt,
len + sizeof(struct ether_header));
if ((ifp->if_flags & IFF_PROMISC) != 0 &&
(et->ether_dhost[0] & 1) == 0 && /* !mcast and !bcast */