mirror of
https://github.com/Telecominfraproject/wlan-ap.git
synced 2025-12-21 11:22:50 +00:00
008ca9618d
Some checks failed
Build OpenWrt/uCentral images / build (cig_wf186h) (push) Has been cancelled
Build OpenWrt/uCentral images / build (cig_wf186w) (push) Has been cancelled
Build OpenWrt/uCentral images / build (cig_wf188n) (push) Has been cancelled
Build OpenWrt/uCentral images / build (cig_wf189) (push) Has been cancelled
Build OpenWrt/uCentral images / build (cig_wf196) (push) Has been cancelled
Build OpenWrt/uCentral images / build (cybertan_eww631-a1) (push) Has been cancelled
Build OpenWrt/uCentral images / build (cybertan_eww631-b1) (push) Has been cancelled
Build OpenWrt/uCentral images / build (edgecore_eap101) (push) Has been cancelled
Build OpenWrt/uCentral images / build (edgecore_eap102) (push) Has been cancelled
Build OpenWrt/uCentral images / build (edgecore_eap104) (push) Has been cancelled
Build OpenWrt/uCentral images / build (edgecore_eap105) (push) Has been cancelled
Build OpenWrt/uCentral images / build (edgecore_eap111) (push) Has been cancelled
Build OpenWrt/uCentral images / build (edgecore_eap112) (push) Has been cancelled
Build OpenWrt/uCentral images / build (edgecore_oap101) (push) Has been cancelled
Build OpenWrt/uCentral images / build (edgecore_oap101-6e) (push) Has been cancelled
Build OpenWrt/uCentral images / build (edgecore_oap101e) (push) Has been cancelled
Build OpenWrt/uCentral images / build (edgecore_oap101e-6e) (push) Has been cancelled
Build OpenWrt/uCentral images / build (hfcl_ion4x) (push) Has been cancelled
Build OpenWrt/uCentral images / build (hfcl_ion4x_2) (push) Has been cancelled
Build OpenWrt/uCentral images / build (hfcl_ion4x_3) (push) Has been cancelled
Build OpenWrt/uCentral images / build (hfcl_ion4x_w) (push) Has been cancelled
Build OpenWrt/uCentral images / build (hfcl_ion4xe) (push) Has been cancelled
Build OpenWrt/uCentral images / build (hfcl_ion4xi) (push) Has been cancelled
Build OpenWrt/uCentral images / build (hfcl_ion4xi_w) (push) Has been cancelled
Build OpenWrt/uCentral images / build (indio_um-305ax) (push) Has been cancelled
Build OpenWrt/uCentral images / build (sercomm_ap72tip) (push) Has been cancelled
Build OpenWrt/uCentral images / build (sonicfi_rap630c-311g) (push) Has been cancelled
Build OpenWrt/uCentral images / build (sonicfi_rap630w-211g) (push) Has been cancelled
Build OpenWrt/uCentral images / build (sonicfi_rap630w-311g) (push) Has been cancelled
Build OpenWrt/uCentral images / build (udaya_a6-id2) (push) Has been cancelled
Build OpenWrt/uCentral images / build (udaya_a6-od2) (push) Has been cancelled
Build OpenWrt/uCentral images / build (wallys_dr5018) (push) Has been cancelled
Build OpenWrt/uCentral images / build (wallys_dr6018) (push) Has been cancelled
Build OpenWrt/uCentral images / build (wallys_dr6018-v4) (push) Has been cancelled
Build OpenWrt/uCentral images / build (yuncore_ax820) (push) Has been cancelled
Build OpenWrt/uCentral images / build (yuncore_ax840) (push) Has been cancelled
Build OpenWrt/uCentral images / build (yuncore_fap640) (push) Has been cancelled
Build OpenWrt/uCentral images / build (yuncore_fap650) (push) Has been cancelled
Build OpenWrt/uCentral images / build (yuncore_fap655) (push) Has been cancelled
Build OpenWrt/uCentral images / trigger-testing (push) Has been cancelled
Build OpenWrt/uCentral images / create-x64_vm-ami (push) Has been cancelled
Signed-off-by: John Crispin <john@phrozen.org>
55 lines
2.2 KiB
Diff
55 lines
2.2 KiB
Diff
From 3951d8e0aa5100b8cc7c94f39a67d743f69f2a8b Mon Sep 17 00:00:00 2001
|
|
From: Rameshkumar Sundaram <quic_ramess@quicinc.com>
|
|
Date: Wed, 15 Jun 2022 08:29:43 +0530
|
|
Subject: [PATCH] wpa_supplicant: Add 5GHz 240MHz support for mesh
|
|
|
|
240MHz can be supported in 5 GHz for from channel
|
|
#100 - 144 with right hand 80MHz punctured in 320MHz bandwidth.
|
|
Add support to bring up mesh in 5 GHz 320MHz (240+80 Punctrued).
|
|
When 320MHz is configured for channel 100-144, static puncturing
|
|
pattern bits for higher 80MHz should be set (i.e. pattern & 0xF000)
|
|
should result in 0xF000).
|
|
EHT phy capability for advertising 320MHz support in 6GHz is reused
|
|
for 5GHz as well if 320MHz is configured.
|
|
Add the missing 80MHz channels to bw_80_160 array of
|
|
ibss_mesh_setup_freq().
|
|
|
|
Signed-off-by: Rameshkumar Sundaram <quic_ramess@quicinc.com>
|
|
---
|
|
src/common/ieee802_11_common.c | 3 ++-
|
|
wpa_supplicant/ap.c | 5 ++--
|
|
wpa_supplicant/wpa_supplicant.c | 51 ++++++++++++++++++++++++++++-------------
|
|
3 files changed, 40 insertions(+), 19 deletions(-)
|
|
|
|
diff --git a/src/common/ieee802_11_common.c b/src/common/ieee802_11_common.c
|
|
index 7e34ee7..dc1875f 100644
|
|
--- a/src/common/ieee802_11_common.c
|
|
+++ b/src/common/ieee802_11_common.c
|
|
@@ -1492,7 +1492,8 @@ ieee80211_freq_to_channel_ext(unsigned int freq, int sec_channel,
|
|
if ((freq - 5000) % 5)
|
|
return NUM_HOSTAPD_MODES;
|
|
|
|
- if (vht_opclass)
|
|
+ /* There is no op class defined for 5 GHz 320MHz, let it be unset */
|
|
+ if (vht_opclass || chanwidth == CONF_OPER_CHWIDTH_320MHZ)
|
|
*op_class = vht_opclass;
|
|
else if (sec_channel == 1)
|
|
*op_class = 122;
|
|
diff --git a/wpa_supplicant/ap.c b/wpa_supplicant/ap.c
|
|
index ccb2753..a9e3155 100644
|
|
--- a/wpa_supplicant/ap.c
|
|
+++ b/wpa_supplicant/ap.c
|
|
@@ -104,9 +104,10 @@ static void wpas_conf_ap_vht(struct wpa_supplicant *wpa_s,
|
|
hostapd_set_oper_centr_freq_seg0_idx(conf, freq_seg_idx);
|
|
|
|
wpa_printf(MSG_DEBUG,
|
|
- "VHT seg0 index %d and seg1 index %d for AP",
|
|
+ "VHT seg0 index %d and seg1 index %d BW %d for AP",
|
|
hostapd_get_oper_centr_freq_seg0_idx(conf),
|
|
- hostapd_get_oper_centr_freq_seg1_idx(conf));
|
|
+ hostapd_get_oper_centr_freq_seg1_idx(conf),
|
|
+ hostapd_get_oper_chwidth(conf));
|
|
return;
|
|
}
|
|
|