diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-02-19 17:22:03 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-02-19 17:22:03 +0000 |
| commit | d6f1617f41551a5d1d830927f249daab37f478dd (patch) | |
| tree | 54bc4c1f3542746166ad2c6a738d9f5671e9249a /sys/dev | |
| parent | 436ba3a8320b9ab26391c20991c5af97cb283c26 (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')
| -rw-r--r-- | sys/dev/usb/if_ral.c | 10 | ||||
| -rw-r--r-- | sys/dev/usb/if_rum.c | 10 | ||||
| -rw-r--r-- | sys/dev/usb/if_uath.c | 10 |
3 files changed, 9 insertions, 21 deletions
diff --git a/sys/dev/usb/if_ral.c b/sys/dev/usb/if_ral.c index 3e5da8453e6..1b35c9a6fe0 100644 --- a/sys/dev/usb/if_ral.c +++ b/sys/dev/usb/if_ral.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ral.c,v 1.88 2007/01/02 14:43:50 claudio Exp $ */ +/* $OpenBSD: if_ral.c,v 1.89 2007/02/19 17:22:02 deraadt Exp $ */ /*- * Copyright (c) 2005, 2006 @@ -638,14 +638,10 @@ ural_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) { - ural_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; } 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; } 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; } |