diff options
author | Claudio Jeker <claudio@cvs.openbsd.org> | 2020-10-22 14:31:28 +0000 |
---|---|---|
committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2020-10-22 14:31:28 +0000 |
commit | 7ef2eb8c932d0ca12083143b729c293afae8746d (patch) | |
tree | f649c4c1188a0c86fe31bfa8638d6e65b4dc6870 /sys/dev/ic/bwfm.c | |
parent | dd241885fc70b6ae68ac2f60258a459b26f4b2c7 (diff) |
Switch away from splsoftnet() and change the code to splnet().
splsoftnet was used for the upper layers of the network stack and
should no longer be used.
OK patrick@
Diffstat (limited to 'sys/dev/ic/bwfm.c')
-rw-r--r-- | sys/dev/ic/bwfm.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/dev/ic/bwfm.c b/sys/dev/ic/bwfm.c index 1c129d788df..84d2f7adb45 100644 --- a/sys/dev/ic/bwfm.c +++ b/sys/dev/ic/bwfm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bwfm.c,v 1.74 2020/07/20 07:45:44 stsp Exp $ */ +/* $OpenBSD: bwfm.c,v 1.75 2020/10/22 14:31:27 claudio Exp $ */ /* * Copyright (c) 2010-2016 Broadcom Corporation * Copyright (c) 2016,2017 Patrick Wildt <patrick@blueri.se> @@ -2284,7 +2284,7 @@ bwfm_rx_event(struct bwfm_softc *sc, struct mbuf *m) { int s; - s = splsoftnet(); + s = splnet(); ml_enqueue(&sc->sc_evml, m); splx(s); @@ -2496,22 +2496,22 @@ bwfm_task(void *arg) struct mbuf *m; int s; - s = splsoftnet(); + s = splnet(); while (ring->next != ring->cur) { cmd = &ring->cmd[ring->next]; splx(s); cmd->cb(sc, cmd->data); - s = splsoftnet(); + s = splnet(); ring->queued--; ring->next = (ring->next + 1) % BWFM_HOST_CMD_RING_COUNT; } splx(s); - s = splsoftnet(); + s = splnet(); while ((m = ml_dequeue(&sc->sc_evml)) != NULL) { splx(s); bwfm_rx_event_cb(sc, m); - s = splsoftnet(); + s = splnet(); } splx(s); } @@ -2524,7 +2524,7 @@ bwfm_do_async(struct bwfm_softc *sc, struct bwfm_host_cmd *cmd; int s; - s = splsoftnet(); + s = splnet(); KASSERT(ring->queued < BWFM_HOST_CMD_RING_COUNT); if (ring->queued >= BWFM_HOST_CMD_RING_COUNT) { splx(s); |