From 3d91a0470f27780a3aee943b01f548d360b3f5fb Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Sun, 2 Mar 2014 15:05:28 +0200 Subject: [PATCH] DFS: Make sure center frequency is always initialized for VHT This seemed to be fine on most code paths, but the code was complex enough to make the analysis difficult (and a bit too much for static analyzers). There is no harm in forcing these parameters to be initialized, so do that to make sure they cannot be left uninitialized. Signed-off-by: Jouni Malinen --- src/ap/dfs.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/ap/dfs.c b/src/ap/dfs.c index 612f5348a..2b8b90fcc 100644 --- a/src/ap/dfs.c +++ b/src/ap/dfs.c @@ -214,6 +214,7 @@ static void dfs_adjust_vht_center_freq(struct hostapd_iface *iface, break; default: wpa_printf(MSG_INFO, "DFS only VHT20/40/80/160 is supported now"); + *vht_oper_centr_freq_seg0_idx = 0; break; } @@ -359,6 +360,9 @@ dfs_get_valid_channel(struct hostapd_iface *iface, u32 _rand; wpa_printf(MSG_DEBUG, "DFS: Selecting random channel"); + *secondary_channel = 0; + *vht_oper_centr_freq_seg0_idx = 0; + *vht_oper_centr_freq_seg1_idx = 0; if (iface->current_mode == NULL) return NULL;