summaryrefslogtreecommitdiffstats
path: root/sys/dev/usb/if_rum.c
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>2007-02-19 17:22:02 +0000
committerderaadt <deraadt@openbsd.org>2007-02-19 17:22:02 +0000
commitd267521f6ab1a070b71be6b9bf99de7d7623098e (patch)
treed6b718bfefa25436196aa459dd02715285a9e678 /sys/dev/usb/if_rum.c
parentonly make this interface available to the kernel for now, discussed witha (diff)
downloadwireguard-openbsd-d267521f6ab1a070b71be6b9bf99de7d7623098e.tar.xz
wireguard-openbsd-d267521f6ab1a070b71be6b9bf99de7d7623098e.zip
do not do a curproc test for interrupt context, because it is plainly wrong.
this lets these work on macppc, for instance diagnosed by kettenis, but damien is not around, so ok jsg and others
Diffstat (limited to 'sys/dev/usb/if_rum.c')
-rw-r--r--sys/dev/usb/if_rum.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/sys/dev/usb/if_rum.c b/sys/dev/usb/if_rum.c
index 508668e0f5c..0e767561047 100644
--- a/sys/dev/usb/if_rum.c
+++ b/sys/dev/usb/if_rum.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_rum.c,v 1.53 2007/02/08 06:19:31 jsg Exp $ */
+/* $OpenBSD: if_rum.c,v 1.54 2007/02/19 17:22:02 deraadt Exp $ */
/*-
* Copyright (c) 2005-2007 Damien Bergamini <damien.bergamini@free.fr>
@@ -704,14 +704,10 @@ rum_newstate(struct ieee80211com *ic, enum ieee80211_state nstate, int arg)
timeout_del(&sc->scan_to);
timeout_del(&sc->amrr_to);
+ /* do it in a process context */
sc->sc_state = nstate;
sc->sc_arg = arg;
- if (curproc != NULL) {
- rum_task(sc);
- } else {
- /* do it in a process context */
- usb_add_task(sc->sc_udev, &sc->sc_task);
- }
+ usb_add_task(sc->sc_udev, &sc->sc_task);
return 0;
}