summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorDamien Bergamini <damien@cvs.openbsd.org>2004-11-24 21:27:51 +0000
committerDamien Bergamini <damien@cvs.openbsd.org>2004-11-24 21:27:51 +0000
commite0bd00ccf29814e74a50c0b795114bdca9c7c1f7 (patch)
tree639ee7dc5ca20bb7bae7bde9033859634462be86 /sys
parentc89e7a839214d2f97095f551a54bda756e8a1ab6 (diff)
don't leave run state on background scan
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/pci/if_ipw.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/dev/pci/if_ipw.c b/sys/dev/pci/if_ipw.c
index 732a546773e..f64f48e8d73 100644
--- a/sys/dev/pci/if_ipw.c
+++ b/sys/dev/pci/if_ipw.c
@@ -1,4 +1,4 @@
-/* $Id: if_ipw.c,v 1.27 2004/11/24 20:50:55 damien Exp $ */
+/* $Id: if_ipw.c,v 1.28 2004/11/24 21:27:50 damien Exp $ */
/*-
* Copyright (c) 2004
@@ -515,7 +515,9 @@ ipw_newstate_intr(struct ipw_softc *sc, struct ipw_soft_buf *sbuf)
break;
case IPW_STATE_SCANNING:
- ieee80211_new_state(ic, IEEE80211_S_SCAN, -1);
+ /* don't leave run state on background scan */
+ if (ic->ic_state != IEEE80211_S_RUN)
+ ieee80211_new_state(ic, IEEE80211_S_SCAN, -1);
break;
case IPW_STATE_ASSOCIATION_LOST: