summaryrefslogtreecommitdiffstats
path: root/sys/dev/pci/if_ipw.c
diff options
context:
space:
mode:
authordamien <damien@openbsd.org>2010-11-15 19:11:57 +0000
committerdamien <damien@openbsd.org>2010-11-15 19:11:57 +0000
commit4a6a9e9ce24ba3af2470144e7013bf47353afc0a (patch)
treefe4dc04e790e24d07a324665dcc378b1442af8da /sys/dev/pci/if_ipw.c
parentadd urtwn(4) to more USB 2.0 capable architectures, since it works (diff)
downloadwireguard-openbsd-4a6a9e9ce24ba3af2470144e7013bf47353afc0a.tar.xz
wireguard-openbsd-4a6a9e9ce24ba3af2470144e7013bf47353afc0a.zip
Reset ic_scan_lock in {ipw,iwi}_stop similarly to {wpi,iwn}_stop.
From Jeremy Chase.
Diffstat (limited to 'sys/dev/pci/if_ipw.c')
-rw-r--r--sys/dev/pci/if_ipw.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/sys/dev/pci/if_ipw.c b/sys/dev/pci/if_ipw.c
index e670fa0dec0..368a447645f 100644
--- a/sys/dev/pci/if_ipw.c
+++ b/sys/dev/pci/if_ipw.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ipw.c,v 1.93 2010/09/07 16:21:45 deraadt Exp $ */
+/* $OpenBSD: if_ipw.c,v 1.94 2010/11/15 19:11:57 damien Exp $ */
/*-
* Copyright (c) 2004-2008
@@ -2082,6 +2082,9 @@ ipw_stop(struct ifnet *ifp, int disable)
for (i = 0; i < IPW_NTBD; i++)
ipw_release_sbd(sc, &sc->stbd_list[i]);
+ /* in case we were scanning, release the scan "lock" */
+ ic->ic_scan_lock = IEEE80211_SCAN_UNLOCKED;
+
ieee80211_new_state(ic, IEEE80211_S_INIT, -1);
}