Page MenuHomeFreeBSD
Files F115648033

D45816.diff
No OneTemporary
Actions

D45816.diff
View Options

diff --git a/sys/net80211/ieee80211_adhoc.c b/sys/net80211/ieee80211_adhoc.c
--- a/sys/net80211/ieee80211_adhoc.c
+++ b/sys/net80211/ieee80211_adhoc.c
@@ -763,7 +763,7 @@
* XXX check if the beacon we recv'd gives
* us what we need and suppress the probe req
*/
- ieee80211_probe_curchan(vap, 1);
+ ieee80211_probe_curchan(vap, true);
ic->ic_flags_ext &= ~IEEE80211_FEXT_PROBECHAN;
}
ieee80211_add_scan(vap, rxchan, &scan, wh,
diff --git a/sys/net80211/ieee80211_hostap.c b/sys/net80211/ieee80211_hostap.c
--- a/sys/net80211/ieee80211_hostap.c
+++ b/sys/net80211/ieee80211_hostap.c
@@ -1817,7 +1817,7 @@
* XXX check if the beacon we recv'd gives
* us what we need and suppress the probe req
*/
- ieee80211_probe_curchan(vap, 1);
+ ieee80211_probe_curchan(vap, true);
ic->ic_flags_ext &= ~IEEE80211_FEXT_PROBECHAN;
}
ieee80211_add_scan(vap, ic->ic_curchan, &scan, wh,
diff --git a/sys/net80211/ieee80211_mesh.c b/sys/net80211/ieee80211_mesh.c
--- a/sys/net80211/ieee80211_mesh.c
+++ b/sys/net80211/ieee80211_mesh.c
@@ -1878,7 +1878,7 @@
* XXX check if the beacon we recv'd gives
* us what we need and suppress the probe req
*/
- ieee80211_probe_curchan(vap, 1);
+ ieee80211_probe_curchan(vap, true);
ic->ic_flags_ext &= ~IEEE80211_FEXT_PROBECHAN;
}
ieee80211_add_scan(vap, rxchan, &scan, wh,
diff --git a/sys/net80211/ieee80211_scan.h b/sys/net80211/ieee80211_scan.h
--- a/sys/net80211/ieee80211_scan.h
+++ b/sys/net80211/ieee80211_scan.h
@@ -104,7 +104,7 @@
void (*sc_cancel_anyscan)(struct ieee80211vap *);
void (*sc_scan_next)(struct ieee80211vap *);
void (*sc_scan_done)(struct ieee80211vap *);
- void (*sc_scan_probe_curchan)(struct ieee80211vap *, int);
+ void (*sc_scan_probe_curchan)(struct ieee80211vap *, bool);
void (*sc_add_scan)(struct ieee80211vap *,
struct ieee80211_channel *,
const struct ieee80211_scanparams *,
@@ -179,7 +179,7 @@
void ieee80211_cancel_anyscan(struct ieee80211vap *);
void ieee80211_scan_next(struct ieee80211vap *);
void ieee80211_scan_done(struct ieee80211vap *);
-void ieee80211_probe_curchan(struct ieee80211vap *, int);
+void ieee80211_probe_curchan(struct ieee80211vap *, bool);
struct ieee80211_channel *ieee80211_scan_pickchannel(struct ieee80211com *, int);
struct ieee80211_scanparams;
diff --git a/sys/net80211/ieee80211_scan.c b/sys/net80211/ieee80211_scan.c
--- a/sys/net80211/ieee80211_scan.c
+++ b/sys/net80211/ieee80211_scan.c
@@ -513,7 +513,7 @@
* then we'll transmit a probe request.
*/
void
-ieee80211_probe_curchan(struct ieee80211vap *vap, int force)
+ieee80211_probe_curchan(struct ieee80211vap *vap, bool force)
{
struct ieee80211com *ic = vap->iv_ic;
diff --git a/sys/net80211/ieee80211_scan_sw.c b/sys/net80211/ieee80211_scan_sw.c
--- a/sys/net80211/ieee80211_scan_sw.c
+++ b/sys/net80211/ieee80211_scan_sw.c
@@ -522,7 +522,7 @@
* then we'll transmit a probe request.
*/
static void
-ieee80211_swscan_probe_curchan(struct ieee80211vap *vap, int force)
+ieee80211_swscan_probe_curchan(struct ieee80211vap *vap, bool force __unused)
{
struct ieee80211com *ic = vap->iv_ic;
struct ieee80211_scan_state *ss = ic->ic_scan;
@@ -569,7 +569,7 @@
maxdwell);
IEEE80211_LOCK(ic);
if (ss->ss_flags & IEEE80211_SCAN_ACTIVE)
- ieee80211_probe_curchan(vap, 0);
+ ieee80211_probe_curchan(vap, false);
taskqueue_enqueue_timeout(ic->ic_tq,
&SCAN_PRIVATE(ss)->ss_scan_curchan, maxdwell);
IEEE80211_UNLOCK(ic);
diff --git a/sys/net80211/ieee80211_sta.c b/sys/net80211/ieee80211_sta.c
--- a/sys/net80211/ieee80211_sta.c
+++ b/sys/net80211/ieee80211_sta.c
@@ -1690,7 +1690,7 @@
* XXX check if the beacon we recv'd gives
* us what we need and suppress the probe req
*/
- ieee80211_probe_curchan(vap, 1);
+ ieee80211_probe_curchan(vap, true);
ic->ic_flags_ext &= ~IEEE80211_FEXT_PROBECHAN;
}
ieee80211_add_scan(vap, rxchan, &scan, wh,

File Metadata

Mime Type
text/plain
Expires
Sun, Apr 27, 12:59 PM (10 h, 9 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
17817925
Default Alt Text
D45816.diff (3 KB)

Event Timeline