DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

hw_feature: Correctly select mode in case of the 6 GHz band

Browse source 
There are 2 HW modes with IEEE80211_MODE_A: one for the 5 GHz channels
and one for 6 GHz channels. Since hw_get_chan() checks all the
compatible hw modes, eventually, an incorrect hw mode is selected.

To fix this, add a function that checks if a specific mode supports
the requested frequency and if so use it as the current mode.

Signed-off-by: Ilan Peer <ilan.peer@intel.com>
Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
This commit is contained in:
Ilan Peer 2020-10-22 14:00:25 +03:00 committed by Jouni Malinen
parent cc96f45f4f
commit 99cd453720
3 changed files with 33 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/ap/hw_features.c
View file

@ -1074,12 +1074,13 @@ int hostapd_select_hw_mode(struct hostapd_iface *iface)
iface->current_mode = NULL; iface->current_mode = NULL;
for (i = 0; i < iface->num_hw_features; i++) { for (i = 0; i < iface->num_hw_features; i++) {
struct hostapd_hw_modes *mode = &iface->hw_features[i]; struct hostapd_hw_modes *mode = &iface->hw_features[i];
int chan;
if (mode->mode == iface->conf->hw_mode) { if (mode->mode == iface->conf->hw_mode) {
if (iface->freq > 0 && if (iface->freq > 0 &&
!hw_get_chan(mode->mode, iface->freq, !hw_mode_get_channel(mode, iface->freq, &chan))
iface->hw_features,
iface->num_hw_features))
continue; continue;
iface->current_mode = mode; iface->current_mode = mode;
break; break;
} }

38
src/common/hw_features_common.c
View file

@ -40,11 +40,31 @@ struct hostapd_channel_data * hw_get_channel_chan(struct hostapd_hw_modes *mode,
} }
struct hostapd_channel_data *
hw_mode_get_channel(struct hostapd_hw_modes *mode, int freq, int *chan)
{
int i;
for (i = 0; i < mode->num_channels; i++) {
struct hostapd_channel_data *ch = &mode->channels[i];
if (ch->freq == freq) {
if (chan)
*chan = ch->chan;
return ch;
}
}
return NULL;
}
struct hostapd_channel_data * struct hostapd_channel_data *
hw_get_channel_freq(enum hostapd_hw_mode mode, int freq, int *chan, hw_get_channel_freq(enum hostapd_hw_mode mode, int freq, int *chan,
struct hostapd_hw_modes *hw_features, int num_hw_features) struct hostapd_hw_modes *hw_features, int num_hw_features)
{ {
int i, j; struct hostapd_channel_data *chan_data;
int i;
if (chan) if (chan)
*chan = 0; *chan = 0;
@ -52,21 +72,15 @@ hw_get_channel_freq(enum hostapd_hw_mode mode, int freq, int *chan,
if (!hw_features) if (!hw_features)
return NULL; return NULL;
for (j = 0; j < num_hw_features; j++) { for (i = 0; i < num_hw_features; i++) {
struct hostapd_hw_modes *curr_mode = &hw_features[j]; struct hostapd_hw_modes *curr_mode = &hw_features[i];
if (curr_mode->mode != mode) if (curr_mode->mode != mode)
continue; continue;
for (i = 0; i < curr_mode->num_channels; i++) {
struct hostapd_channel_data *ch =
&curr_mode->channels[i];
if (ch->freq == freq) { chan_data = hw_mode_get_channel(curr_mode, freq, chan);
if (chan) if (chan_data)
*chan = ch->chan; return chan_data;
return ch;
}
}
} }
return NULL; return NULL;

3
src/common/hw_features_common.h
View file

@ -14,6 +14,9 @@
struct hostapd_channel_data * hw_get_channel_chan(struct hostapd_hw_modes *mode, struct hostapd_channel_data * hw_get_channel_chan(struct hostapd_hw_modes *mode,
int chan, int *freq); int chan, int *freq);
struct hostapd_channel_data *
hw_mode_get_channel(struct hostapd_hw_modes *mode, int freq, int *chan);
struct hostapd_channel_data * struct hostapd_channel_data *
hw_get_channel_freq(enum hostapd_hw_mode mode, int freq, int *chan, hw_get_channel_freq(enum hostapd_hw_mode mode, int freq, int *chan,
struct hostapd_hw_modes *hw_features, int num_hw_features); struct hostapd_hw_modes *hw_features, int num_hw_features);