Deleted Added
full compact
ieee80211_scan_sta.c (187991) ieee80211_scan_sta.c (188777)
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 187991 2009-02-01 22:24:08Z sam $");
27__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_scan_sta.c 188777 2009-02-19 04:40:47Z sam $");
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>

--- 364 unchanged lines hidden (view full) ---

400 }
401 for (j = 0; j < i; j++) {
402 c = &ic->ic_channels[j];
403 if (c->ic_freq == freq && IEEE80211_IS_CHAN_G(c))
404 return c;
405 }
406 return NULL;
407}
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>

--- 364 unchanged lines hidden (view full) ---

400 }
401 for (j = 0; j < i; j++) {
402 c = &ic->ic_channels[j];
403 if (c->ic_freq == freq && IEEE80211_IS_CHAN_G(c))
404 return c;
405 }
406 return NULL;
407}
408
408static const u_int chanflags[IEEE80211_MODE_MAX] = {
409static const u_int chanflags[IEEE80211_MODE_MAX] = {
409 IEEE80211_CHAN_B, /* IEEE80211_MODE_AUTO */
410 IEEE80211_CHAN_A, /* IEEE80211_MODE_11A */
411 IEEE80211_CHAN_B, /* IEEE80211_MODE_11B */
412 IEEE80211_CHAN_G, /* IEEE80211_MODE_11G */
413 IEEE80211_CHAN_FHSS, /* IEEE80211_MODE_FH */
414 IEEE80211_CHAN_A, /* IEEE80211_MODE_TURBO_A (check base channel)*/
415 IEEE80211_CHAN_G, /* IEEE80211_MODE_TURBO_G */
416 IEEE80211_CHAN_ST, /* IEEE80211_MODE_STURBO_A */
417 IEEE80211_CHAN_A, /* IEEE80211_MODE_11NA (check legacy) */
418 IEEE80211_CHAN_G, /* IEEE80211_MODE_11NG (check legacy) */
410 [IEEE80211_MODE_AUTO] = IEEE80211_CHAN_B,
411 [IEEE80211_MODE_11A] = IEEE80211_CHAN_A,
412 [IEEE80211_MODE_11B] = IEEE80211_CHAN_B,
413 [IEEE80211_MODE_11G] = IEEE80211_CHAN_G,
414 [IEEE80211_MODE_FH] = IEEE80211_CHAN_FHSS,
415 /* check base channel */
416 [IEEE80211_MODE_TURBO_A] = IEEE80211_CHAN_A,
417 [IEEE80211_MODE_TURBO_G] = IEEE80211_CHAN_G,
418 [IEEE80211_MODE_STURBO_A] = IEEE80211_CHAN_ST,
419 /* check legacy */
420 [IEEE80211_MODE_11NA] = IEEE80211_CHAN_A,
421 [IEEE80211_MODE_11NG] = IEEE80211_CHAN_G,
419};
420
421static void
422add_channels(struct ieee80211vap *vap,
423 struct ieee80211_scan_state *ss,
424 enum ieee80211_phymode mode, const uint16_t freq[], int nfreq)
425{
426#define N(a) (sizeof(a) / sizeof(a[0]))

--- 1331 unchanged lines hidden ---
422};
423
424static void
425add_channels(struct ieee80211vap *vap,
426 struct ieee80211_scan_state *ss,
427 enum ieee80211_phymode mode, const uint16_t freq[], int nfreq)
428{
429#define N(a) (sizeof(a) / sizeof(a[0]))

--- 1331 unchanged lines hidden ---