34705946e2
Drop outdated and by now broken patchset originally supplied by Peter Oh in August 2018 but never merged upstream. Instead add the more promissing rework recently submitted by Markus Theil who picked up Peter's patchset, fixed and completed it and added support for HE (802.11ax) in mesh mode. This is only compile tested and needs some real-life testing. Fixes: FS#3214 Fixes:167028b750("hostapd: Update to version 2.9 (2019-08-08)") Fixes:0a3ec87a66("hostapd: update to latest Git hostap_2_9-1238-gdd2daf0848ed") Fixes:017320ead3("hostapd: bring back mesh patches") Signed-off-by: Daniel Golle <daniel@makrotopia.org>
84 lines
2.8 KiB
Diff
84 lines
2.8 KiB
Diff
From 6522dcbbcf71abcb80cce84b93b4a9a5cfcd4fca Mon Sep 17 00:00:00 2001
|
|
From: Markus Theil <markus.theil@tu-ilmenau.de>
|
|
Date: Tue, 30 Jun 2020 13:53:22 +0200
|
|
Subject: [PATCH 06/19] hw_features: better debug messages for some error cases
|
|
|
|
Signed-off-by: Markus Theil <markus.theil@tu-ilmenau.de>
|
|
---
|
|
src/common/hw_features_common.c | 29 ++++++++++++++++++++++-------
|
|
1 file changed, 22 insertions(+), 7 deletions(-)
|
|
|
|
--- a/src/common/hw_features_common.c
|
|
+++ b/src/common/hw_features_common.c
|
|
@@ -540,13 +540,18 @@ int hostapd_set_freq_params(struct hosta
|
|
if (center_segment1 ||
|
|
(center_segment0 != 0 &&
|
|
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 (=%i) and center freq 1 (=%i) not in sync",
|
|
+ center_segment0, data->center_freq1);
|
|
return -1;
|
|
+ }
|
|
break;
|
|
case CHANWIDTH_80P80MHZ:
|
|
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;
|
|
+ }
|
|
data->center_freq2 = 5000 + center_segment1 * 5;
|
|
/* fall through */
|
|
case CHANWIDTH_80MHZ:
|
|
@@ -555,8 +560,10 @@ int hostapd_set_freq_params(struct hosta
|
|
center_segment1) ||
|
|
(oper_chwidth == CHANWIDTH_80P80MHZ &&
|
|
!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;
|
|
+ }
|
|
if (!center_segment0) {
|
|
if (channel <= 48)
|
|
center_segment0 = 42;
|
|
@@ -582,16 +589,22 @@ int hostapd_set_freq_params(struct hosta
|
|
center_segment0 == channel - 2 ||
|
|
center_segment0 == channel - 6)
|
|
data->center_freq1 = 5000 + center_segment0 * 5;
|
|
- else
|
|
+ else {
|
|
+ wpa_printf(MSG_ERROR, "Wrong coupling between HT and VHT/HE channel setting");
|
|
return -1;
|
|
+ }
|
|
}
|
|
break;
|
|
case CHANWIDTH_160MHZ:
|
|
data->bandwidth = 160;
|
|
- if (center_segment1)
|
|
+ if (center_segment1) {
|
|
+ wpa_printf(MSG_ERROR, "160 MHz: center segment 1 should not be set");
|
|
return -1;
|
|
- if (!sec_channel_offset)
|
|
+ }
|
|
+ if (!sec_channel_offset) {
|
|
+ wpa_printf(MSG_ERROR, "160 MHz: second channel offset not set");
|
|
return -1;
|
|
+ }
|
|
/*
|
|
* Note: HT/VHT config and params are coupled. Check if
|
|
* HT40 channel band is in VHT160 channel band configuration.
|
|
@@ -605,8 +618,10 @@ int hostapd_set_freq_params(struct hosta
|
|
center_segment0 == channel - 10 ||
|
|
center_segment0 == channel - 14)
|
|
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;
|
|
+ }
|
|
break;
|
|
}
|
|
|