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

ACS: Add supported channel bandwidth checking

Browse source 
While doing automatic channel selection we need to take into account
supported bandwidth for each channel provided via nl80211. Without this
modification hostapd might select an unsupported channel which would
fail during AP startup.

Signed-off-by: Dmitry Lebed <dlebed@quantenna.com>
This commit is contained in:
Dmitry Lebed 2018-03-01 14:49:28 +03:00 committed by Jouni Malinen
parent ce6d9ce15b
commit 75ce63e063
1 changed files with 25 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/ap/acs.c
View file

@ -13,6 +13,7 @@
#include "utils/common.h" #include "utils/common.h"
#include "utils/list.h" #include "utils/list.h"
#include "common/ieee802_11_defs.h" #include "common/ieee802_11_defs.h"
#include "common/hw_features_common.h"
#include "common/wpa_ctrl.h" #include "common/wpa_ctrl.h"
#include "drivers/driver.h" #include "drivers/driver.h"
#include "hostapd.h" #include "hostapd.h"
@ -578,6 +579,7 @@ acs_find_ideal_chan(struct hostapd_iface *iface)
long double factor, ideal_factor = 0; long double factor, ideal_factor = 0;
int i, j; int i, j;
int n_chans = 1; int n_chans = 1;
u32 bw;
unsigned int k; unsigned int k;
/* TODO: HT40- support */ /* TODO: HT40- support */
@ -603,10 +605,12 @@ acs_find_ideal_chan(struct hostapd_iface *iface)
} }
} }
bw = num_chan_to_bw(n_chans);
/* TODO: VHT80+80. Update acs_adjust_vht_center_freq() too. */ /* TODO: VHT80+80. Update acs_adjust_vht_center_freq() too. */
wpa_printf(MSG_DEBUG, "ACS: Survey analysis for selected bandwidth %d MHz", wpa_printf(MSG_DEBUG,
n_chans * 20); "ACS: Survey analysis for selected bandwidth %d MHz", bw);
for (i = 0; i < iface->current_mode->num_channels; i++) { for (i = 0; i < iface->current_mode->num_channels; i++) {
double total_weight; double total_weight;
@ -614,12 +618,23 @@ acs_find_ideal_chan(struct hostapd_iface *iface)
chan = &iface->current_mode->channels[i]; chan = &iface->current_mode->channels[i];
if (chan->flag & HOSTAPD_CHAN_DISABLED) /* Since in the current ACS implementation the first channel is
* always a primary channel, skip channels not available as
* primary until more sophisticated channel selection is
* implemented. */
if (!chan_pri_allowed(chan))
continue; continue;
if (!is_in_chanlist(iface, chan)) if (!is_in_chanlist(iface, chan))
continue; continue;
if (!chan_bw_allowed(chan, bw, 1, 1)) {
wpa_printf(MSG_DEBUG,
"ACS: Channel %d: BW %u is not supported",
chan->chan, bw);
continue;
}
/* HT40 on 5 GHz has a limited set of primary channels as per /* HT40 on 5 GHz has a limited set of primary channels as per
* 11n Annex J */ * 11n Annex J */
if (iface->current_mode->mode == HOSTAPD_MODE_IEEE80211A && if (iface->current_mode->mode == HOSTAPD_MODE_IEEE80211A &&
@ -662,6 +677,13 @@ acs_find_ideal_chan(struct hostapd_iface *iface)
if (!adj_chan) if (!adj_chan)
break; break;
if (!chan_bw_allowed(adj_chan, bw, 1, 0)) {
wpa_printf(MSG_DEBUG,
"ACS: PRI Channel %d: secondary channel %d BW %u is not supported",
chan->chan, adj_chan->chan, bw);
break;
}
if (acs_usable_chan(adj_chan)) { if (acs_usable_chan(adj_chan)) {
factor += adj_chan->interference_factor; factor += adj_chan->interference_factor;
total_weight += 1; total_weight += 1;