diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2012-01-26 00:45:41 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2012-01-26 00:45:41 +0000 |
| commit | 0ca8da635f0b2cb138f4ebc698045746f9699b0c (patch) | |
| tree | 9ae50f33f32ac8050e9b95016cf027348d6f7ad2 /sys | |
| parent | 3a72a69739d64dbae275d70bfd732b2d7e4b0042 (diff) | |
stop the calibration timeout when stopping the interface (i noticed
this issue due to suspend/resume during a calibration)
ok stsp miod
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/pci/if_iwn.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/dev/pci/if_iwn.c b/sys/dev/pci/if_iwn.c index d57835e6dcb..a45f0bf8096 100644 --- a/sys/dev/pci/if_iwn.c +++ b/sys/dev/pci/if_iwn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwn.c,v 1.112 2011/09/02 18:49:36 kettenis Exp $ */ +/* $OpenBSD: if_iwn.c,v 1.113 2012/01/26 00:45:40 deraadt Exp $ */ /*- * Copyright (c) 2007-2010 Damien Bergamini <damien.bergamini@free.fr> @@ -5863,6 +5863,7 @@ iwn_stop(struct ifnet *ifp, int disable) struct iwn_softc *sc = ifp->if_softc; struct ieee80211com *ic = &sc->sc_ic; + timeout_del(&sc->calib_to); ifp->if_timer = sc->sc_tx_timer = 0; ifp->if_flags &= ~(IFF_RUNNING | IFF_OACTIVE); |