From 9438e9c785b76bdd6919c79b84dc494d32983882 Mon Sep 17 00:00:00 2001 From: Andrei Otcheretianski Date: Tue, 8 Sep 2015 12:46:11 +0300 Subject: [PATCH] Use previously computed channel in cs_freq_params for Beacon frames When CSA is started, hostapd_change_config_freq() computes the channel from the provided frequency. Use this stored channel to add CSA IE in Beacon frames, instead of recomputing the channel each time. Signed-off-by: Andrei Otcheretianski --- src/ap/beacon.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/ap/beacon.c b/src/ap/beacon.c index 5fe8fd566..cdca8a3d4 100644 --- a/src/ap/beacon.c +++ b/src/ap/beacon.c @@ -297,19 +297,13 @@ static u8 * hostapd_eid_wpa(struct hostapd_data *hapd, u8 *eid, size_t len) static u8 * hostapd_eid_csa(struct hostapd_data *hapd, u8 *eid) { - u8 chan; - - if (!hapd->cs_freq_params.freq) - return eid; - - if (ieee80211_freq_to_chan(hapd->cs_freq_params.freq, &chan) == - NUM_HOSTAPD_MODES) + if (!hapd->cs_freq_params.channel) return eid; *eid++ = WLAN_EID_CHANNEL_SWITCH; *eid++ = 3; *eid++ = hapd->cs_block_tx; - *eid++ = chan; + *eid++ = hapd->cs_freq_params.channel; *eid++ = hapd->cs_count; return eid;