| ieee80211_scan_sta.c (208697) | ieee80211_scan_sta.c (213321) |
|---|---|
| 1/*- 2 * Copyright (c) 2002-2009 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-2009 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_sta.c 208697 2010-06-01 14:17:08Z rpaulo $"); | 27__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_scan_sta.c 213321 2010-10-01 09:18:30Z adrian $"); |
| 28 29/* 30 * IEEE 802.11 station scanning support. 31 */ 32#include "opt_wlan.h" 33 34#include <sys/param.h> 35#include <sys/systm.h> --- 1320 unchanged lines hidden (view full) --- 1356 * in sta mode and automatic roaming is set. 1357 * XXX defer if busy 1358 * XXX repeater station 1359 * XXX do when !bgscan? 1360 */ 1361 KASSERT(vap->iv_opmode == IEEE80211_M_STA, 1362 ("wrong mode %u", vap->iv_opmode)); 1363 if (vap->iv_roaming == IEEE80211_ROAMING_AUTO && | 28 29/* 30 * IEEE 802.11 station scanning support. 31 */ 32#include "opt_wlan.h" 33 34#include <sys/param.h> 35#include <sys/systm.h> --- 1320 unchanged lines hidden (view full) --- 1356 * in sta mode and automatic roaming is set. 1357 * XXX defer if busy 1358 * XXX repeater station 1359 * XXX do when !bgscan? 1360 */ 1361 KASSERT(vap->iv_opmode == IEEE80211_M_STA, 1362 ("wrong mode %u", vap->iv_opmode)); 1363 if (vap->iv_roaming == IEEE80211_ROAMING_AUTO && |
| 1364 (vap->iv_ic->ic_flags & IEEE80211_F_BGSCAN) && | 1364 (vap->iv_flags & IEEE80211_F_BGSCAN) && |
| 1365 vap->iv_state >= IEEE80211_S_RUN) 1366 /* XXX vap is implicit */ 1367 sta_roam_check(ss, vap); 1368} 1369 1370/* 1371 * Iterate over the entries in the scan cache, invoking 1372 * the callback function on each one. --- 554 unchanged lines hidden --- | 1365 vap->iv_state >= IEEE80211_S_RUN) 1366 /* XXX vap is implicit */ 1367 sta_roam_check(ss, vap); 1368} 1369 1370/* 1371 * Iterate over the entries in the scan cache, invoking 1372 * the callback function on each one. --- 554 unchanged lines hidden --- |