summaryrefslogtreecommitdiff
path: root/sys/dev/usb/if_uath.c
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2007-02-19 17:22:03 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2007-02-19 17:22:03 +0000
commitd6f1617f41551a5d1d830927f249daab37f478dd (patch)
tree54bc4c1f3542746166ad2c6a738d9f5671e9249a /sys/dev/usb/if_uath.c
parent436ba3a8320b9ab26391c20991c5af97cb283c26 (diff)
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_uath.c')
-rw-r--r--sys/dev/usb/if_uath.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/sys/dev/usb/if_uath.c b/sys/dev/usb/if_uath.c
index b571847a136..a1f05fd8e45 100644
--- a/sys/dev/usb/if_uath.c
+++ b/sys/dev/usb/if_uath.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_uath.c,v 1.16 2007/01/02 14:43:50 claudio Exp $ */
+/* $OpenBSD: if_uath.c,v 1.17 2007/02/19 17:22:02 deraadt Exp $ */
/*-
* Copyright (c) 2006
@@ -922,14 +922,10 @@ uath_newstate(struct ieee80211com *ic, enum ieee80211_state nstate, int arg)
timeout_del(&sc->scan_to);
timeout_del(&sc->stat_to);
+ /* do it in a process context */
sc->sc_state = nstate;
sc->sc_arg = arg;
- if (curproc != NULL) {
- uath_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;
}