diff options
| author | Stefan Sperling <stsp@cvs.openbsd.org> | 2017-01-30 21:54:31 +0000 |
|---|---|---|
| committer | Stefan Sperling <stsp@cvs.openbsd.org> | 2017-01-30 21:54:31 +0000 |
| commit | c4c9f4d6979086500502cead132f24a7a2d38e06 (patch) | |
| tree | fccb537a1e1479251271ef6c1296ce484aceb17f /sys/dev/ic | |
| parent | 6127ed20408f93f972c67ecf5f5150dd01b6d1eb (diff) | |
Make urtwn(4) run slot time updates from a USB task.
Fixes 'usbd_do_request: not in process context' warnings introduced recently.
Fix reported and confirmed by Mikhail aka mp39590 aka misha
Diffstat (limited to 'sys/dev/ic')
| -rw-r--r-- | sys/dev/ic/rtwn.c | 4 | ||||
| -rw-r--r-- | sys/dev/ic/rtwnvar.h | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/sys/dev/ic/rtwn.c b/sys/dev/ic/rtwn.c index 586c987e797..c9dff3f134a 100644 --- a/sys/dev/ic/rtwn.c +++ b/sys/dev/ic/rtwn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtwn.c,v 1.14 2017/01/30 17:48:26 stsp Exp $ */ +/* $OpenBSD: rtwn.c,v 1.15 2017/01/30 21:54:30 stsp Exp $ */ /*- * Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr> @@ -90,8 +90,6 @@ int rtwn_r88e_ra_init(struct rtwn_softc *, u_int8_t, u_int32_t, void rtwn_tsf_sync_enable(struct rtwn_softc *); void rtwn_set_led(struct rtwn_softc *, int, int); void rtwn_update_short_preamble(struct ieee80211com *); -void rtwn_updateslot(struct ieee80211com *); -void rtwn_updateedca(struct ieee80211com *); void rtwn_update_avgrssi(struct rtwn_softc *, int, int8_t); int8_t rtwn_r88e_get_rssi(struct rtwn_softc *, int, void *); void rtwn_watchdog(struct ifnet *); diff --git a/sys/dev/ic/rtwnvar.h b/sys/dev/ic/rtwnvar.h index ff52d1560ba..f7c57c68fab 100644 --- a/sys/dev/ic/rtwnvar.h +++ b/sys/dev/ic/rtwnvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rtwnvar.h,v 1.7 2016/06/17 10:53:55 stsp Exp $ */ +/* $OpenBSD: rtwnvar.h,v 1.8 2017/01/30 21:54:30 stsp Exp $ */ /*- * Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr> @@ -110,6 +110,7 @@ void rtwn_update_avgrssi(struct rtwn_softc *, int, int8_t); void rtwn_calib(struct rtwn_softc *); void rtwn_next_scan(struct rtwn_softc *); int rtwn_newstate(struct ieee80211com *, enum ieee80211_state, int); +void rtwn_updateslot(struct ieee80211com *); void rtwn_updateedca(struct ieee80211com *); int rtwn_set_key(struct ieee80211com *, struct ieee80211_node *, struct ieee80211_key *); |