DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

hw_features: Better debug messages for some error cases

Browse source 
Signed-off-by: Markus Theil <markus.theil@tu-ilmenau.de>
This commit is contained in:
Markus Theil 2020-06-30 13:53:22 +02:00 committed by Jouni Malinen
parent 5965c7da5d
commit a72599b319
1 changed files with 29 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/common/hw_features_common.c
View file

@ -540,13 +540,20 @@ int hostapd_set_freq_params(struct hostapd_freq_params *data,
if (center_segment1 || if (center_segment1 ||
(center_segment0 != 0 && (center_segment0 != 0 &&
5000 + center_segment0 * 5 != data->center_freq1 && 5000 + center_segment0 * 5 != data->center_freq1 &&
2407 + center_segment0 * 5 != data->center_freq1)) 2407 + center_segment0 * 5 != data->center_freq1)) {
wpa_printf(MSG_ERROR,
"20/40 MHz: center segment 0 (=%d) and center freq 1 (=%d) not in sync",
center_segment0, data->center_freq1);
return -1; return -1;
}
break; break;
case CHANWIDTH_80P80MHZ: case CHANWIDTH_80P80MHZ:
if (center_segment1 == center_segment0 + 4 || if (center_segment1 == center_segment0 + 4 ||
center_segment1 == center_segment0 - 4) center_segment1 == center_segment0 - 4) {
wpa_printf(MSG_ERROR,
"80+80 MHz: center segment 1 only 20 MHz apart");
return -1; return -1;
}
data->center_freq2 = 5000 + center_segment1 * 5; data->center_freq2 = 5000 + center_segment1 * 5;
/* fall through */ /* fall through */
case CHANWIDTH_80MHZ: case CHANWIDTH_80MHZ:
@ -555,8 +562,11 @@ int hostapd_set_freq_params(struct hostapd_freq_params *data,
center_segment1) || center_segment1) ||
(oper_chwidth == CHANWIDTH_80P80MHZ && (oper_chwidth == CHANWIDTH_80P80MHZ &&
!center_segment1) || !center_segment1) ||
!sec_channel_offset) !sec_channel_offset) {
wpa_printf(MSG_ERROR,
"80/80+80 MHz: center segment 1 wrong or no second channel offset");
return -1; return -1;
}
if (!center_segment0) { if (!center_segment0) {
if (channel <= 48) if (channel <= 48)
center_segment0 = 42; center_segment0 = 42;
@ -582,16 +592,25 @@ int hostapd_set_freq_params(struct hostapd_freq_params *data,
center_segment0 == channel - 2 || center_segment0 == channel - 2 ||
center_segment0 == channel - 6) center_segment0 == channel - 6)
data->center_freq1 = 5000 + center_segment0 * 5; data->center_freq1 = 5000 + center_segment0 * 5;
else else {
wpa_printf(MSG_ERROR,
"Wrong coupling between HT and VHT/HE channel setting");
return -1; return -1;
}
} }
break; break;
case CHANWIDTH_160MHZ: case CHANWIDTH_160MHZ:
data->bandwidth = 160; data->bandwidth = 160;
if (center_segment1) if (center_segment1) {
wpa_printf(MSG_ERROR,
"160 MHz: center segment 1 should not be set");
return -1; return -1;
if (!sec_channel_offset) }
if (!sec_channel_offset) {
wpa_printf(MSG_ERROR,
"160 MHz: second channel offset not set");
return -1; return -1;
}
/* /*
* Note: HT/VHT config and params are coupled. Check if * Note: HT/VHT config and params are coupled. Check if
* HT40 channel band is in VHT160 channel band configuration. * HT40 channel band is in VHT160 channel band configuration.
@ -605,8 +624,11 @@ int hostapd_set_freq_params(struct hostapd_freq_params *data,
center_segment0 == channel - 10 || center_segment0 == channel - 10 ||
center_segment0 == channel - 14) center_segment0 == channel - 14)
data->center_freq1 = 5000 + center_segment0 * 5; data->center_freq1 = 5000 + center_segment0 * 5;
else else {
wpa_printf(MSG_ERROR,
"160 MHz: HT40 channel band is not in 160 MHz band");
return -1; return -1;
}
break; break;
} }