From 8e4491c8edba77d6857e0c3eba9f7ecd8164cf4d Mon Sep 17 00:00:00 2001 From: Manikandan Mohan Date: Wed, 23 Oct 2019 16:00:51 -0700 Subject: [PATCH] qcacld-3.0: Send HE 6GHz band capabilities IE in WLAN frames HE STA / AP operating in 6GHz should send HE 6GHz band capabilities element. Update LIM layer for sending this IE in assoc, reassoc and probe request / response frames. Change-Id: Ie991ad3656e6b721e0ee0783b5974d438699091c CRs-fixed: 2552009 --- core/mac/src/pe/lim/lim_send_frames_host_roam.c | 4 ++++ core/mac/src/pe/lim/lim_send_management_frames.c | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/core/mac/src/pe/lim/lim_send_frames_host_roam.c b/core/mac/src/pe/lim/lim_send_frames_host_roam.c index ae349789b7d6..925061121903 100644 --- a/core/mac/src/pe/lim/lim_send_frames_host_roam.c +++ b/core/mac/src/pe/lim/lim_send_frames_host_roam.c @@ -316,6 +316,8 @@ void lim_send_reassoc_req_with_ft_ies_mgmt_frame(struct mac_context *mac_ctx, pe_debug("Populate HE IEs"); populate_dot11f_he_caps(mac_ctx, pe_session, &frm->he_cap); + populate_dot11f_he_6ghz_cap(mac_ctx, pe_session, + &frm->he_6ghz_band_cap); } status = dot11f_get_packed_re_assoc_request_size(mac_ctx, frm, @@ -694,6 +696,8 @@ void lim_send_reassoc_req_mgmt_frame(struct mac_context *mac, pe_debug("Populate HE IEs"); populate_dot11f_he_caps(mac, pe_session, &frm->he_cap); + populate_dot11f_he_6ghz_cap(mac_ctx, pe_session, + &frm->he_6ghz_band_cap); } nStatus = diff --git a/core/mac/src/pe/lim/lim_send_management_frames.c b/core/mac/src/pe/lim/lim_send_management_frames.c index de1a13b63e0a..c859d77aaa2c 100644 --- a/core/mac/src/pe/lim/lim_send_management_frames.c +++ b/core/mac/src/pe/lim/lim_send_management_frames.c @@ -315,6 +315,8 @@ lim_send_probe_req_mgmt_frame(struct mac_context *mac_ctx, pe_debug("Populate HE IEs"); populate_dot11f_he_caps(mac_ctx, pesession, &pr.he_cap); + populate_dot11f_he_6ghz_cap(mac_ctx, pesession, + &pr.he_6ghz_band_cap); if (addn_ielen && additional_ie) { qdf_mem_zero((uint8_t *)&extracted_ext_cap, @@ -627,6 +629,8 @@ lim_send_probe_rsp_mgmt_frame(struct mac_context *mac_ctx, &frm->he_cap); populate_dot11f_he_operation(mac_ctx, pe_session, &frm->he_op); + populate_dot11f_he_6ghz_cap(mac_ctx, pe_session, + &frm->he_6ghz_band_cap); } populate_dot11f_ext_cap(mac_ctx, is_vht_enabled, &frm->ExtCap, @@ -2032,9 +2036,13 @@ lim_send_assoc_req_mgmt_frame(struct mac_context *mac_ctx, pe_debug("Populate HE IEs"); populate_dot11f_he_caps(mac_ctx, pe_session, &frm->he_cap); + populate_dot11f_he_6ghz_cap(mac_ctx, pe_session, + &frm->he_6ghz_band_cap); } else if (pe_session->he_with_wep_tkip) { pe_debug("Populate HE IEs in Assoc Request with WEP/TKIP"); populate_dot11f_he_caps(mac_ctx, NULL, &frm->he_cap); + populate_dot11f_he_6ghz_cap(mac_ctx, pe_session, + &frm->he_6ghz_band_cap); } if (pe_session->lim_join_req->is11Rconnection) {