Deleted Added
full compact
ieee80211_scan.c (330461) ieee80211_scan.c (344223)
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: stable/11/sys/net80211/ieee80211_scan.c 330461 2018-03-05 08:22:48Z eadler $");
27__FBSDID("$FreeBSD: stable/11/sys/net80211/ieee80211_scan.c 344223 2019-02-17 03:12:27Z avos $");
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>

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

117 [IEEE80211_MODE_11NG] = { .rssi = ROAM_RSSI_11B_DEFAULT,
118 .rate = ROAM_MCS_11N_DEFAULT },
119};
120
121void
122ieee80211_scan_vattach(struct ieee80211vap *vap)
123{
124 struct ieee80211com *ic = vap->iv_ic;
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>

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

117 [IEEE80211_MODE_11NG] = { .rssi = ROAM_RSSI_11B_DEFAULT,
118 .rate = ROAM_MCS_11N_DEFAULT },
119};
120
121void
122ieee80211_scan_vattach(struct ieee80211vap *vap)
123{
124 struct ieee80211com *ic = vap->iv_ic;
125 int m;
125
126 vap->iv_bgscanidle = (IEEE80211_BGSCAN_IDLE_DEFAULT*1000)/hz;
127 vap->iv_bgscanintvl = IEEE80211_BGSCAN_INTVAL_DEFAULT*hz;
128 vap->iv_scanvalid = IEEE80211_SCAN_VALID_DEFAULT*hz;
129
130 vap->iv_roaming = IEEE80211_ROAMING_AUTO;
126
127 vap->iv_bgscanidle = (IEEE80211_BGSCAN_IDLE_DEFAULT*1000)/hz;
128 vap->iv_bgscanintvl = IEEE80211_BGSCAN_INTVAL_DEFAULT*hz;
129 vap->iv_scanvalid = IEEE80211_SCAN_VALID_DEFAULT*hz;
130
131 vap->iv_roaming = IEEE80211_ROAMING_AUTO;
131 memcpy(vap->iv_roamparms, defroam, sizeof(defroam));
132
132
133 memset(vap->iv_roamparms, 0, sizeof(vap->iv_roamparms));
134 for (m = IEEE80211_MODE_AUTO + 1; m < IEEE80211_MODE_MAX; m++) {
135 if (isclr(ic->ic_modecaps, m))
136 continue;
137
138 memcpy(&vap->iv_roamparms[m], &defroam[m], sizeof(defroam[m]));
139 }
140
133 ic->ic_scan_methods->sc_vattach(vap);
134}
135
136void
137ieee80211_scan_vdetach(struct ieee80211vap *vap)
138{
139 struct ieee80211com *ic = vap->iv_ic;
140 struct ieee80211_scan_state *ss;

--- 530 unchanged lines hidden ---
141 ic->ic_scan_methods->sc_vattach(vap);
142}
143
144void
145ieee80211_scan_vdetach(struct ieee80211vap *vap)
146{
147 struct ieee80211com *ic = vap->iv_ic;
148 struct ieee80211_scan_state *ss;

--- 530 unchanged lines hidden ---