| ieee80211_scan_sw.c (284143) | ieee80211_scan_sw.c (293022) |
|---|---|
| 1/*- 2 * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 10 unchanged lines hidden (view full) --- 19 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 20 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 21 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 24 */ 25 26#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 10 unchanged lines hidden (view full) --- 19 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 20 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 21 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 24 */ 25 26#include <sys/cdefs.h> |
| 27__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_scan_sw.c 284143 2015-06-08 02:35:43Z adrian $"); | 27__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_scan_sw.c 293022 2016-01-01 00:21:07Z adrian $"); |
| 28 29/* 30 * IEEE 802.11 scanning support. 31 */ 32#include "opt_wlan.h" 33 34#include <sys/param.h> 35#include <sys/systm.h> --- 600 unchanged lines hidden (view full) --- 636 /* Enable station power save mode */ 637 vap->iv_sta_ps(vap, 1); 638 /* 639 * Use an 1ms delay so the null data frame has a chance 640 * to go out. 641 * XXX Should use M_TXCB mechanism to eliminate this. 642 */ 643 cv_timedwait(&SCAN_PRIVATE(ss)->ss_scan_cv, | 28 29/* 30 * IEEE 802.11 scanning support. 31 */ 32#include "opt_wlan.h" 33 34#include <sys/param.h> 35#include <sys/systm.h> --- 600 unchanged lines hidden (view full) --- 636 /* Enable station power save mode */ 637 vap->iv_sta_ps(vap, 1); 638 /* 639 * Use an 1ms delay so the null data frame has a chance 640 * to go out. 641 * XXX Should use M_TXCB mechanism to eliminate this. 642 */ 643 cv_timedwait(&SCAN_PRIVATE(ss)->ss_scan_cv, |
| 644 IEEE80211_LOCK_OBJ(ic), hz / 1000); | 644 IEEE80211_LOCK_OBJ(ic), msecs_to_ticks(1)); |
| 645 if (SCAN_PRIVATE(ss)->ss_iflags & ISCAN_ABORT) 646 goto done; 647 } 648 } 649 650 scanend = ticks + SCAN_PRIVATE(ss)->ss_duration; 651 652 /* XXX scan state can change! Re-validate scan state! */ --- 306 unchanged lines hidden --- | 645 if (SCAN_PRIVATE(ss)->ss_iflags & ISCAN_ABORT) 646 goto done; 647 } 648 } 649 650 scanend = ticks + SCAN_PRIVATE(ss)->ss_duration; 651 652 /* XXX scan state can change! Re-validate scan state! */ --- 306 unchanged lines hidden --- |