From 0f37b8142b8423b63a3ae8a8744c50bb7f638c7a Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Sun, 7 Mar 2021 00:54:36 +0200 Subject: [PATCH] More specific set_freq_params debug prints for 80/80+80 MHz errors It is more convenient to see the exact error in the debug log instead of getting noted that something was invalid. Signed-off-by: Jouni Malinen --- src/common/hw_features_common.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/common/hw_features_common.c b/src/common/hw_features_common.c index b8b886fa1..ad2aebfef 100644 --- a/src/common/hw_features_common.c +++ b/src/common/hw_features_common.c @@ -572,13 +572,19 @@ int hostapd_set_freq_params(struct hostapd_freq_params *data, /* fall through */ case CHANWIDTH_80MHZ: data->bandwidth = 80; - if ((oper_chwidth == CHANWIDTH_80MHZ && - center_segment1) || - (oper_chwidth == CHANWIDTH_80P80MHZ && - !center_segment1) || - !sec_channel_offset) { + if (!sec_channel_offset) { wpa_printf(MSG_ERROR, - "80/80+80 MHz: center segment 1 wrong or no second channel offset"); + "80/80+80 MHz: no second channel offset"); + return -1; + } + if (oper_chwidth == CHANWIDTH_80MHZ && center_segment1) { + wpa_printf(MSG_ERROR, + "80 MHz: center segment 1 configured"); + return -1; + } + if (oper_chwidth == CHANWIDTH_80P80MHZ && !center_segment1) { + wpa_printf(MSG_ERROR, + "80+80 MHz: center segment 1 not configured"); return -1; } if (!center_segment0) {