upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-02-18 18:20:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

net80211: scan/internal: change boolean argument from int to bool

Browse source 
ieee80211_probe_curchan() passes a "force" argument which is bool.
Make it such.  Adjust the (*sc_scan_probe_curchan)() KPI to bool
as well. This is all a big NOP as the only implementor of this
function, ieee80211_swscan_probe_curchan(), does not use the argument
at all.

I came across this when pondering a different scan implementation.
Rather than dropping the change remove the argument from the function,
and push the cleanup out given it is purely net80211 internal code
(the argument may have reason for existance in the future).

Sponsored by:	The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D45816

(cherry picked from commit 9776aba34576596cbe49084457ee40730fec55a2)
This commit is contained in:
Bjoern A. Zeeb 2024-06-30 21:16:39 +00:00
parent af034dcbb2
commit e9624aa3f2
7 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sys/net80211/ieee80211_adhoc.c
View file

@ -767,7 +767,7 @@ adhoc_recv_mgmt(struct ieee80211_node *ni, struct mbuf *m0,
* 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,

2
sys/net80211/ieee80211_hostap.c
View file

@ -1816,7 +1816,7 @@ hostap_recv_mgmt(struct ieee80211_node *ni, struct mbuf *m0,
* 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,

2
sys/net80211/ieee80211_mesh.c
View file

@ -1881,7 +1881,7 @@ mesh_recv_mgmt(struct ieee80211_node *ni, struct mbuf *m0, int subtype,
* 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,

2
sys/net80211/ieee80211_scan.c
View file

@ -513,7 +513,7 @@ ieee80211_scan_done(struct ieee80211vap *vap)
* 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;

4
sys/net80211/ieee80211_scan.h
View file

@ -104,7 +104,7 @@ struct ieee80211_scan_methods {
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_scan(struct ieee80211vap *);
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;

4
sys/net80211/ieee80211_scan_sw.c
View file

@ -522,7 +522,7 @@ ieee80211_swscan_scan_done(struct ieee80211vap *vap)
* 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 @@ scan_curchan(struct ieee80211_scan_state *ss, unsigned long maxdwell)
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);

2
sys/net80211/ieee80211_sta.c
View file

@ -1694,7 +1694,7 @@ sta_recv_mgmt(struct ieee80211_node *ni, struct mbuf *m0, int subtype,
* 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,