From 6892b91b88a197b58d69034697cdc0cf67cfecad Mon Sep 17 00:00:00 2001 From: dyoung Date: Sun, 2 Nov 2003 02:14:33 +0000 Subject: [PATCH] No need to check which state we're changing FROM when we deactivate the scan callout. --- sys/dev/ic/atw.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/ic/atw.c b/sys/dev/ic/atw.c index 8e0884338235..74323f192989 100644 --- a/sys/dev/ic/atw.c +++ b/sys/dev/ic/atw.c @@ -1,4 +1,4 @@ -/* $NetBSD: atw.c,v 1.10 2003/11/02 02:05:15 dyoung Exp $ */ +/* $NetBSD: atw.c,v 1.11 2003/11/02 02:14:33 dyoung Exp $ */ /*- * Copyright (c) 1998, 1999, 2000, 2002, 2003, 2004 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: atw.c,v 1.10 2003/11/02 02:05:15 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: atw.c,v 1.11 2003/11/02 02:14:33 dyoung Exp $"); #include "bpfilter.h" @@ -2460,7 +2460,7 @@ atw_newstate(struct ieee80211com *ic, enum ieee80211_state nstate, int arg) break; } - if (ostate == IEEE80211_S_SCAN && nstate != IEEE80211_S_SCAN) + if (nstate != IEEE80211_S_SCAN) callout_stop(&sc->sc_scan_ch); if (nstate == IEEE80211_S_RUN &&