Module Name: src Committed By: nonaka Date: Wed Mar 4 16:55:11 UTC 2015
Modified Files: src/sys/dev/pci: if_iwm.c Log Message: stop the calibration timeout when stopping the interface. >From OpenBSD rev.1.35. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/sys/dev/pci/if_iwm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/dev/pci/if_iwm.c diff -u src/sys/dev/pci/if_iwm.c:1.25 src/sys/dev/pci/if_iwm.c:1.26 --- src/sys/dev/pci/if_iwm.c:1.25 Wed Mar 4 16:53:32 2015 +++ src/sys/dev/pci/if_iwm.c Wed Mar 4 16:55:11 2015 @@ -1,5 +1,5 @@ -/* $NetBSD: if_iwm.c,v 1.25 2015/03/04 16:53:32 nonaka Exp $ */ -/* OpenBSD: if_iwm.c,v 1.34 2015/03/03 20:14:34 kettenis Exp */ +/* $NetBSD: if_iwm.c,v 1.26 2015/03/04 16:55:11 nonaka Exp $ */ +/* OpenBSD: if_iwm.c,v 1.35 2015/03/04 15:18:12 jsg Exp */ /* * Copyright (c) 2014 genua mbh <i...@genua.de> @@ -105,7 +105,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_iwm.c,v 1.25 2015/03/04 16:53:32 nonaka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_iwm.c,v 1.26 2015/03/04 16:55:11 nonaka Exp $"); #include <sys/param.h> #include <sys/conf.h> @@ -5849,6 +5849,7 @@ iwm_stop(struct ifnet *ifp, int disable) if (ic->ic_state != IEEE80211_S_INIT) ieee80211_new_state(ic, IEEE80211_S_INIT, -1); + callout_stop(&sc->sc_calib_to); ifp->if_timer = sc->sc_tx_timer = 0; iwm_stop_device(sc); }