jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

ACS: Extend acs_find_chan() for all modes

Browse source 
This is preparation for being able to support hw_mode=any to select the
best channel from any supported mode.

Signed-off-by: Neo Jou <neojou@gmail.com>
This commit is contained in:
Neo Jou 2020-01-13 16:31:28 +08:00 committed by Jouni Malinen
parent 4c1ffb45e4
commit 070522e5b2
1 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/ap/acs.c
View file

@ -538,14 +538,14 @@ static void acs_survey_all_chans_interference_factor(
} }
static struct hostapd_channel_data *acs_find_chan(struct hostapd_iface *iface, static struct hostapd_channel_data *
int freq) acs_find_chan_mode(struct hostapd_hw_modes *mode, int freq)
{ {
struct hostapd_channel_data *chan; struct hostapd_channel_data *chan;
int i; int i;
for (i = 0; i < iface->current_mode->num_channels; i++) { for (i = 0; i < mode->num_channels; i++) {
chan = &iface->current_mode->channels[i]; chan = &mode->channels[i];
if (chan->flag & HOSTAPD_CHAN_DISABLED) if (chan->flag & HOSTAPD_CHAN_DISABLED)
continue; continue;
@ -558,6 +558,26 @@ static struct hostapd_channel_data *acs_find_chan(struct hostapd_iface *iface,
} }
static struct hostapd_channel_data *
acs_find_chan(struct hostapd_iface *iface, int freq)
{
int i;
struct hostapd_hw_modes *mode;
struct hostapd_channel_data *chan;
for (i = 0; i < iface->num_hw_features; i++) {
mode = &iface->hw_features[i];
if (!hostapd_hw_skip_mode(iface, mode)) {
chan = acs_find_chan_mode(mode, freq);
if (chan)
return chan;
}
}
return NULL;
}
static int is_24ghz_mode(enum hostapd_hw_mode mode) static int is_24ghz_mode(enum hostapd_hw_mode mode)
{ {
return mode == HOSTAPD_MODE_IEEE80211B || return mode == HOSTAPD_MODE_IEEE80211B ||