Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src-draft/trunk]: src/sys/dev/usb Undo state machine locking as it is unnece...
details: https://anonhg.NetBSD.org/src-all/rev/32462eb1f803
branches: trunk
changeset: 952500:32462eb1f803
user: Nathanial Sloss <nat%netbsd.org@localhost>
date: Sun Aug 16 05:02:36 2020 +1000
description:
Undo state machine locking as it is unnecessary.
diffstat:
sys/dev/usb/if_urtwn.c | 4 ----
sys/dev/usb/if_urtwnvar.h | 1 -
2 files changed, 0 insertions(+), 5 deletions(-)
diffs (46 lines):
diff -r 59445b4f1b49 -r 32462eb1f803 sys/dev/usb/if_urtwn.c
--- a/sys/dev/usb/if_urtwn.c Sun Aug 16 04:55:23 2020 +1000
+++ b/sys/dev/usb/if_urtwn.c Sun Aug 16 05:02:36 2020 +1000
@@ -430,7 +430,6 @@
mutex_init(&sc->sc_rx_mtx, MUTEX_DEFAULT, IPL_SOFTNET);
mutex_init(&sc->sc_fwcmd_mtx, MUTEX_DEFAULT, IPL_NONE);
mutex_init(&sc->sc_write_mtx, MUTEX_DEFAULT, IPL_NONE);
- mutex_init(&sc->sc_state_mtx, MUTEX_DEFAULT, IPL_NONE);
mutex_enter(&sc->sc_write_mtx);
usb_init_task(&sc->sc_task, urtwn_task, sc, 0);
@@ -702,7 +701,6 @@
callout_destroy(&sc->sc_scan_to);
callout_destroy(&sc->sc_calib_to);
- mutex_destroy(&sc->sc_state_mtx);
mutex_destroy(&sc->sc_write_mtx);
mutex_destroy(&sc->sc_fwcmd_mtx);
mutex_destroy(&sc->sc_tx_mtx);
@@ -2364,7 +2362,6 @@
ieee80211_state_name[nstate], nstate));
s = splnet();
- mutex_enter(&sc->sc_state_mtx);
mutex_enter(&sc->sc_write_mtx);
callout_stop(&sc->sc_scan_to);
@@ -2675,7 +2672,6 @@
#endif
error = (*sc->sc_newstate)(vap, nstate, arg);
- mutex_exit(&sc->sc_state_mtx);
splx(s);
return error;
}
diff -r 59445b4f1b49 -r 32462eb1f803 sys/dev/usb/if_urtwnvar.h
--- a/sys/dev/usb/if_urtwnvar.h Sun Aug 16 04:55:23 2020 +1000
+++ b/sys/dev/usb/if_urtwnvar.h Sun Aug 16 05:02:36 2020 +1000
@@ -135,7 +135,6 @@
kmutex_t sc_tx_mtx;
kmutex_t sc_rx_mtx;
kmutex_t sc_write_mtx;
- kmutex_t sc_state_mtx;
kmutex_t sc_media_mtx; /* XXX */
struct usbd_pipe * rx_pipe[R92C_MAX_EPIN];
Home |
Main Index |
Thread Index |
Old Index