Deleted Added
full compact
ifieee80211.c (218090) ifieee80211.c (218093)
1/*
2 * Copyright 2001 The Aerospace Corporation. All rights reserved.
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.

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

19 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
20 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
21 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25 * SUCH DAMAGE.
26 *
1/*
2 * Copyright 2001 The Aerospace Corporation. All rights reserved.
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.

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

19 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
20 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
21 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25 * SUCH DAMAGE.
26 *
27 * $FreeBSD: head/sbin/ifconfig/ifieee80211.c 218090 2011-01-30 13:17:45Z bschmidt $
27 * $FreeBSD: head/sbin/ifconfig/ifieee80211.c 218093 2011-01-30 14:22:45Z bschmidt $
28 */
29
30/*-
31 * Copyright (c) 1997, 1998, 2000 The NetBSD Foundation, Inc.
32 * All rights reserved.
33 *
34 * This code is derived from software contributed to The NetBSD Foundation
35 * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,

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

3225 | IEEE80211_IOC_SCAN_BGSCAN
3226 | IEEE80211_IOC_SCAN_NOPICK
3227 | IEEE80211_IOC_SCAN_ONCE;
3228 sr.sr_duration = IEEE80211_IOC_SCAN_FOREVER;
3229 sr.sr_nssid = 0;
3230
3231 ireq.i_data = &sr;
3232 ireq.i_len = sizeof(sr);
28 */
29
30/*-
31 * Copyright (c) 1997, 1998, 2000 The NetBSD Foundation, Inc.
32 * All rights reserved.
33 *
34 * This code is derived from software contributed to The NetBSD Foundation
35 * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,

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

3225 | IEEE80211_IOC_SCAN_BGSCAN
3226 | IEEE80211_IOC_SCAN_NOPICK
3227 | IEEE80211_IOC_SCAN_ONCE;
3228 sr.sr_duration = IEEE80211_IOC_SCAN_FOREVER;
3229 sr.sr_nssid = 0;
3230
3231 ireq.i_data = &sr;
3232 ireq.i_len = sizeof(sr);
3233 /* NB: only root can trigger a scan so ignore errors */
3234 if (ioctl(s, SIOCS80211, &ireq) >= 0) {
3233 /*
3234 * NB: only root can trigger a scan so ignore errors. Also ignore
3235 * possible errors from net80211, even if no new scan could be
3236 * started there might still be a valid scan cache.
3237 */
3238 if (ioctl(s, SIOCS80211, &ireq) == 0) {
3235 char buf[2048];
3236 struct if_announcemsghdr *ifan;
3237 struct rt_msghdr *rtm;
3238
3239 do {
3240 if (read(sroute, buf, sizeof(buf)) < 0) {
3241 perror("read(PF_ROUTE)");
3242 break;

--- 2035 unchanged lines hidden ---
3239 char buf[2048];
3240 struct if_announcemsghdr *ifan;
3241 struct rt_msghdr *rtm;
3242
3243 do {
3244 if (read(sroute, buf, sizeof(buf)) < 0) {
3245 perror("read(PF_ROUTE)");
3246 break;

--- 2035 unchanged lines hidden ---