diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2015-03-04 15:18:13 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2015-03-04 15:18:13 +0000 |
| commit | dd6922fad2bf5cfdcf6a1efa9d81279d0e9f8596 (patch) | |
| tree | a0cac7f3cf5c31bdaa22b37c4a3f64bc76804634 /sys/dev/pci | |
| parent | 5ca04e48149c092f3b3b8ef27a8aef2dd93fe17f (diff) | |
stop the calibration timeout when stopping the interface
ok kettenis@ deraadt@
Diffstat (limited to 'sys/dev/pci')
| -rw-r--r-- | sys/dev/pci/if_iwm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/dev/pci/if_iwm.c b/sys/dev/pci/if_iwm.c index ae136699ad6..f6f30890a9a 100644 --- a/sys/dev/pci/if_iwm.c +++ b/sys/dev/pci/if_iwm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwm.c,v 1.34 2015/03/03 20:14:34 kettenis Exp $ */ +/* $OpenBSD: if_iwm.c,v 1.35 2015/03/04 15:18:12 jsg Exp $ */ /* * Copyright (c) 2014 genua mbh <info@genua.de> @@ -5717,6 +5717,7 @@ iwm_stop(struct ifnet *ifp, int disable) if (ic->ic_state != IEEE80211_S_INIT) ieee80211_new_state(ic, IEEE80211_S_INIT, -1); + timeout_del(&sc->sc_calib_to); ifp->if_timer = sc->sc_tx_timer = 0; iwm_stop_device(sc); } |