summaryrefslogtreecommitdiff
path: root/sys/dev/wpi
diff options
context:
space:
mode:
authorBenjamin Close <benjsc@FreeBSD.org>2007-11-27 09:09:09 +0000
committerBenjamin Close <benjsc@FreeBSD.org>2007-11-27 09:09:09 +0000
commit8b92cdc94c568982bc1cdc7263b28d4f4fc03cf9 (patch)
treee19230158140833f1177fd84a1233a65f61b99a4 /sys/dev/wpi
parenta7099588fc298c5f32f88473f5caf33c056718fb (diff)
Notes
Diffstat (limited to 'sys/dev/wpi')
-rw-r--r--sys/dev/wpi/if_wpi.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/sys/dev/wpi/if_wpi.c b/sys/dev/wpi/if_wpi.c
index 981fdce89a64..98c5b9262495 100644
--- a/sys/dev/wpi/if_wpi.c
+++ b/sys/dev/wpi/if_wpi.c
@@ -16,7 +16,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#define VERSION "20071102"
+#define VERSION "20071127"
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
@@ -1331,8 +1331,11 @@ wpi_newstate(struct ieee80211com *ic, enum ieee80211_state nstate, int arg)
struct wpi_softc *sc = ifp->if_softc;
struct ieee80211_node *ni;
int error;
+ WPI_LOCK_DECL;
+ WPI_LOCK(sc);
callout_stop(&sc->calib_to);
+ WPI_UNLOCK(sc);
switch (nstate) {
case IEEE80211_S_SCAN: