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

DFS: Add support for 80+80 MHz when going through channel switch

Browse source 
After a radar signal is detected, the AP should switch to another
channel, but in the case of 80+80 MHz, channel switch failed because
hostapd did not select the secondary channel in the process. Fix this by
selecting a secondary channel in the case of 80+80 MHz.

Signed-off-by: Xin Wang <xwangw@codeaurora.org>
Signed-off-by: Pravas Kumar Panda <kumarpan@codeaurora.org>
This commit is contained in:
Pravas Kumar Panda 2020-03-06 15:06:42 +05:30 committed by Jouni Malinen
parent 72c34d23a4
commit f64b601c47
1 changed files with 54 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
src/ap/dfs.c
View file

@ -263,6 +263,7 @@ static int dfs_find_channel(struct hostapd_iface *iface,
static void dfs_adjust_center_freq(struct hostapd_iface *iface, static void dfs_adjust_center_freq(struct hostapd_iface *iface,
struct hostapd_channel_data *chan, struct hostapd_channel_data *chan,
int secondary_channel, int secondary_channel,
int sec_chan_idx_80p80,
u8 *oper_centr_freq_seg0_idx, u8 *oper_centr_freq_seg0_idx,
u8 *oper_centr_freq_seg1_idx) u8 *oper_centr_freq_seg1_idx)
{ {
@ -289,8 +290,14 @@ static void dfs_adjust_center_freq(struct hostapd_iface *iface,
case CHANWIDTH_160MHZ: case CHANWIDTH_160MHZ:
*oper_centr_freq_seg0_idx = chan->chan + 14; *oper_centr_freq_seg0_idx = chan->chan + 14;
break; break;
case CHANWIDTH_80P80MHZ:
*oper_centr_freq_seg0_idx = chan->chan + 6;
*oper_centr_freq_seg1_idx = sec_chan_idx_80p80 + 6;
break;
default: default:
wpa_printf(MSG_INFO, "DFS only VHT20/40/80/160 is supported now"); wpa_printf(MSG_INFO,
"DFS: Unsupported channel width configuration");
*oper_centr_freq_seg0_idx = 0; *oper_centr_freq_seg0_idx = 0;
break; break;
} }
@ -469,8 +476,11 @@ dfs_get_valid_channel(struct hostapd_iface *iface,
{ {
struct hostapd_hw_modes *mode; struct hostapd_hw_modes *mode;
struct hostapd_channel_data *chan = NULL; struct hostapd_channel_data *chan = NULL;
struct hostapd_channel_data *chan2 = NULL;
int num_available_chandefs; int num_available_chandefs;
int chan_idx; int chan_idx, chan_idx2;
int sec_chan_idx_80p80 = -1;
int i;
u32 _rand; u32 _rand;
wpa_printf(MSG_DEBUG, "DFS: Selecting random channel"); wpa_printf(MSG_DEBUG, "DFS: Selecting random channel");
@ -496,11 +506,12 @@ dfs_get_valid_channel(struct hostapd_iface *iface,
return NULL; return NULL;
chan_idx = _rand % num_available_chandefs; chan_idx = _rand % num_available_chandefs;
dfs_find_channel(iface, &chan, chan_idx, skip_radar); dfs_find_channel(iface, &chan, chan_idx, skip_radar);
if (chan) if (!chan) {
wpa_printf(MSG_DEBUG, "DFS: got random channel %d (%d)",
chan->freq, chan->chan);
else
wpa_printf(MSG_DEBUG, "DFS: no random channel found"); wpa_printf(MSG_DEBUG, "DFS: no random channel found");
return NULL;
}
wpa_printf(MSG_DEBUG, "DFS: got random channel %d (%d)",
chan->freq, chan->chan);
/* dfs_find_channel() calculations assume HT40+ */ /* dfs_find_channel() calculations assume HT40+ */
if (iface->conf->secondary_channel) if (iface->conf->secondary_channel)
@ -508,8 +519,45 @@ dfs_get_valid_channel(struct hostapd_iface *iface,
else else
*secondary_channel = 0; *secondary_channel = 0;
/* Get secondary channel for HT80P80 */
if (hostapd_get_oper_chwidth(iface->conf) == CHANWIDTH_80P80MHZ) {
if (num_available_chandefs <= 1) {
wpa_printf(MSG_ERROR,
"only 1 valid chan, can't support 80+80");
return NULL;
}
/*
* Loop all channels except channel1 to find a valid channel2
* that is not adjacent to channel1.
*/
for (i = 0; i < num_available_chandefs - 1; i++) {
/* start from chan_idx + 1, end when chan_idx - 1 */
chan_idx2 = (chan_idx + 1 + i) % num_available_chandefs;
dfs_find_channel(iface, &chan2, chan_idx2, skip_radar);
if (chan2 && abs(chan2->chan - chan->chan) > 12) {
/* two channels are not adjacent */
sec_chan_idx_80p80 = chan2->chan;
wpa_printf(MSG_DEBUG,
"DFS: got second chan: %d (%d)",
chan2->freq, chan2->chan);
break;
}
}
/* Check if we got a valid secondary channel which is not
* adjacent to the first channel.
*/
if (sec_chan_idx_80p80 == -1) {
wpa_printf(MSG_INFO,
"DFS: failed to get chan2 for 80+80");
return NULL;
}
}
dfs_adjust_center_freq(iface, chan, dfs_adjust_center_freq(iface, chan,
*secondary_channel, *secondary_channel,
sec_chan_idx_80p80,
oper_centr_freq_seg0_idx, oper_centr_freq_seg0_idx,
oper_centr_freq_seg1_idx); oper_centr_freq_seg1_idx);