From 917653b0674dfacc976e20956e999fef13c6e6ba Mon Sep 17 00:00:00 2001 From: Muna Sinada Date: Wed, 29 Jul 2020 09:41:31 -0700 Subject: [PATCH] hostapd:remove 11A specific case to allow for 6 GHz With 6 GHz utilizing 11A/HE, frequency to channel conversions needed to accomedate for 6 GHz frequencies in hostapd_event_ch_switch. Removed 5 GHz specific conversions for the 11A case due to incorrect 6 GHz frequencies being incorrectly being converted in hostapd_event_ch_switch Signed-off-by: Muna Sinada --- src/ap/drv_callbacks.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/ap/drv_callbacks.c b/src/ap/drv_callbacks.c index 35ee8fff8cca..f1d0b26678c7 100644 --- a/src/ap/drv_callbacks.c +++ b/src/ap/drv_callbacks.c @@ -903,18 +903,8 @@ void hostapd_event_ch_switch(struct hostapd_data *hapd, int freq, int ht, break; } - switch (hapd->iface->current_mode->mode) { - case HOSTAPD_MODE_IEEE80211A: - if (cf1 > 5000) - seg0_idx = (cf1 - 5000) / 5; - if (cf2 > 5000) - seg1_idx = (cf2 - 5000) / 5; - break; - default: - ieee80211_freq_to_chan(cf1, &seg0_idx); - ieee80211_freq_to_chan(cf2, &seg1_idx); - break; - } + ieee80211_freq_to_chan(cf1, &seg0_idx); + ieee80211_freq_to_chan(cf2, &seg1_idx); hapd->iconf->channel = channel; hapd->iconf->ieee80211n = ht; -- 2.7.4