From ecba4509d94a50f8ecf26399d4cf2cb352549c9c Mon Sep 17 00:00:00 2001 From: Masashi Honma Date: Thu, 18 Aug 2016 10:06:44 +0900 Subject: [PATCH] mesh: Simplify HT40 check code The ht40 variable can only have values -1 or 1 here, so need to try to address ht40 == 0 case. Signed-off-by: Masashi Honma --- wpa_supplicant/wpa_supplicant.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c index 0eee64116..28fbdf276 100644 --- a/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant/wpa_supplicant.c @@ -1930,22 +1930,16 @@ void ibss_mesh_setup_freq(struct wpa_supplicant *wpa_s, freq->channel = pri_chan->chan; - switch (ht40) { - case -1: + if (ht40 == -1) { if (!(pri_chan->flag & HOSTAPD_CHAN_HT40MINUS)) return; - freq->sec_channel_offset = -1; - break; - case 1: + } else { if (!(pri_chan->flag & HOSTAPD_CHAN_HT40PLUS)) return; - freq->sec_channel_offset = 1; - break; - default: - break; } + freq->sec_channel_offset = ht40; - if (freq->sec_channel_offset && obss_scan) { + if (obss_scan) { struct wpa_scan_results *scan_res; scan_res = wpa_supplicant_get_scan_results(wpa_s, NULL, 0);