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

hostapd: Fix channel switch to a DFS channel

Browse source 
When we are configuring automatic channel selection, we are not able to
switch to a given DFS channel because when we are trying to move to a
DFS channel, the interface is disabled and enabled again. When the
interface is disabled and enabled we are setting iface's freq and
channel to 0 in setup_interface2() in case ACS is enabled, and now we
don't know to which channel we were trying to move. Now ACS will run and
the interface will be up in the channel that is suitable.

To fix this issue add a flag named is_ch_switch_dfs to check if the
channel switch request is for a DFS channel and we can use this in
setup_interface2() to decide whther we have to set iface's freq and
channel to 0 or not. This way iface's freq and channel will retain the
values while channel switching to a DFS channel when ACS is enabled.

Signed-off-by: Rajat Soni <quic_rajson@quicinc.com>
This commit is contained in:
Rajat Soni 2024-04-04 14:50:50 +05:30 committed by Jouni Malinen
parent f4b84ecaf7
commit 36bd75dfd2
3 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
hostapd/ctrl_iface.c
View file

@ -2715,6 +2715,7 @@ static int hostapd_ctrl_iface_chan_switch(struct hostapd_iface *iface,
settings.freq_params.center_freq1); settings.freq_params.center_freq1);
/* Perform CAC and switch channel */ /* Perform CAC and switch channel */
iface->is_ch_switch_dfs = true;
hostapd_switch_channel_fallback(iface, &settings.freq_params); hostapd_switch_channel_fallback(iface, &settings.freq_params);
return 0; return 0;
} }

4
src/ap/hostapd.c
View file

@ -2074,10 +2074,11 @@ static int setup_interface2(struct hostapd_iface *iface)
} else { } else {
int ret; int ret;
if (iface->conf->acs) { if (iface->conf->acs && !iface->is_ch_switch_dfs) {
iface->freq = 0; iface->freq = 0;
iface->conf->channel = 0; iface->conf->channel = 0;
} }
iface->is_ch_switch_dfs = false;
ret = configured_fixed_chan_to_freq(iface); ret = configured_fixed_chan_to_freq(iface);
if (ret < 0) if (ret < 0)
@ -3140,6 +3141,7 @@ struct hostapd_iface * hostapd_init(struct hapd_interfaces *interfaces,
hostapd_bss_setup_multi_link(hapd, interfaces); hostapd_bss_setup_multi_link(hapd, interfaces);
} }
hapd_iface->is_ch_switch_dfs = false;
return hapd_iface; return hapd_iface;
fail: fail:

2
src/ap/hostapd.h
View file

@ -705,6 +705,8 @@ struct hostapd_iface {
/* Configured freq of interface is NO_IR */ /* Configured freq of interface is NO_IR */
bool is_no_ir; bool is_no_ir;
bool is_ch_switch_dfs; /* Channel switch from ACS to DFS */
}; };
/* hostapd.c */ /* hostapd.c */