jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

mesh: Simplify HT40 check code

Browse source 
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 <masashi.honma@gmail.com>
This commit is contained in:
Masashi Honma 2016-08-18 10:06:44 +09:00 committed by Jouni Malinen
parent 05aed438cd
commit ecba4509d9
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
wpa_supplicant/wpa_supplicant.c
View file

@ -1930,22 +1930,16 @@ void ibss_mesh_setup_freq(struct wpa_supplicant *wpa_s,
freq->channel = pri_chan->chan; freq->channel = pri_chan->chan;
switch (ht40) { if (ht40 == -1) {
case -1:
if (!(pri_chan->flag & HOSTAPD_CHAN_HT40MINUS)) if (!(pri_chan->flag & HOSTAPD_CHAN_HT40MINUS))
return; return;
freq->sec_channel_offset = -1; } else {
break;
case 1:
if (!(pri_chan->flag & HOSTAPD_CHAN_HT40PLUS)) if (!(pri_chan->flag & HOSTAPD_CHAN_HT40PLUS))
return; 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; struct wpa_scan_results *scan_res;
scan_res = wpa_supplicant_get_scan_results(wpa_s, NULL, 0); scan_res = wpa_supplicant_get_scan_results(wpa_s, NULL, 0);