diff options
| author |   deraadt <deraadt@openbsd.org> | 1995-12-27 22:06:03 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 1995-12-27 22:06:03 +0000 |
| commit | eecb46f8754b0dfaa24fb6adf798ef64a9d9507c (patch) | |
| tree | 8e40dd7201c30adb1e6be4c90774af856137d5fb /sys/dev/isa/if_ed.c | |
| parent | from netbsd; merge latest Thomas version with our minimal changes (diff) | |
| download | wireguard-openbsd-eecb46f8754b0dfaa24fb6adf798ef64a9d9507c.tar.xz wireguard-openbsd-eecb46f8754b0dfaa24fb6adf798ef64a9d9507c.zip | |
from netbsd:
The IST_* and IPL_* constants are not bus-specific; don't treat them as such.
Change splimp -> splnet in Ethernet, ARCnet, and FDDI drivers.
Diffstat (limited to 'sys/dev/isa/if_ed.c')
| -rw-r--r-- | sys/dev/isa/if_ed.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/isa/if_ed.c b/sys/dev/isa/if_ed.c index 0c4fa0cd428..8b3db662650 100644 --- a/sys/dev/isa/if_ed.c +++ b/sys/dev/isa/if_ed.c @@ -1092,8 +1092,8 @@ edattach(parent, self, aux) bpfattach(&ifp->if_bpf, ifp, DLT_EN10MB, sizeof(struct ether_header)); #endif - sc->sc_ih = isa_intr_establish(ia->ia_irq, ISA_IST_EDGE, ISA_IPL_NET, - edintr, sc); + sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_NET, edintr, + sc); } /* @@ -1105,7 +1105,7 @@ edreset(sc) { int s; - s = splimp(); + s = splnet(); edstop(sc); edinit(sc); splx(s); @@ -1329,7 +1329,7 @@ ed_xmit(sc) /* * Start output on interface. * We make two assumptions here: - * 1) that the current priority is set to splimp _before_ this code + * 1) that the current priority is set to splnet _before_ this code * is called *and* is returned to the appropriate priority after * return * 2) that the IFF_OACTIVE flag is checked before this code is called @@ -1766,7 +1766,7 @@ edioctl(ifp, cmd, data) struct ifreq *ifr = (struct ifreq *)data; int s, error = 0; - s = splimp(); + s = splnet(); switch (cmd) { |