qcacld-3.0: Add support for OUI framework during join request in CSR
Add support to use the action OUI framework to identify vendor APs from
the ini and apply vendor AP specific WARs during CSR join request.
Change-Id: Icb6742bfeb9515c11d61034b795b95b92e833b64
CRs-Fixed: 2254532
diff --git a/core/mac/src/pe/lim/lim_process_sme_req_messages.c b/core/mac/src/pe/lim/lim_process_sme_req_messages.c
index 83ab229..3a27681 100644
--- a/core/mac/src/pe/lim/lim_process_sme_req_messages.c
+++ b/core/mac/src/pe/lim/lim_process_sme_req_messages.c
@@ -1227,7 +1227,6 @@
uint16_t ie_len;
const uint8_t *vendor_ie;
tSirBssDescription *bss_desc;
- struct vdev_type_nss *vdev_type_nss;
if (!mac_ctx || !msg_buf) {
QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR,
@@ -1427,17 +1426,7 @@
/* Copy The channel Id to the session Table */
session->currentOperChannel = bss_desc->channelId;
- if (IS_5G_CH(session->currentOperChannel))
- vdev_type_nss = &mac_ctx->vdev_type_nss_5g;
- else
- vdev_type_nss = &mac_ctx->vdev_type_nss_2g;
- if (session->pePersona == QDF_P2P_CLIENT_MODE)
- session->vdev_nss = vdev_type_nss->p2p_cli;
- else
- session->vdev_nss = vdev_type_nss->sta;
- session->nss = session->vdev_nss;
- if (!mac_ctx->roam.configParam.enable2x2)
- session->nss = 1;
+
session->vhtCapability =
IS_DOT11_MODE_VHT(session->dot11mode);
if (session->vhtCapability) {
@@ -1591,6 +1580,16 @@
session->encryptType = sme_join_req->UCEncryptionType;
+ session->supported_nss_1x1 = sme_join_req->supported_nss_1x1;
+ session->vdev_nss = sme_join_req->vdev_nss;
+ session->nss = sme_join_req->nss;
+ session->nss_forced_1x1 = sme_join_req->nss_forced_1x1;
+
+ pe_debug("nss %d, vdev_nss %d, supported_nss_1x1 %d",
+ session->nss,
+ session->vdev_nss,
+ session->supported_nss_1x1);
+
mlm_join_req->bssDescription.length =
session->pLimJoinReq->bssDescription.length;
@@ -1844,6 +1843,11 @@
pe_debug("vht su bformer [%d]", session_entry->vht_config.su_beam_former);
}
+ session_entry->supported_nss_1x1 = reassoc_req->supported_nss_1x1;
+ session_entry->vdev_nss = reassoc_req->vdev_nss;
+ session_entry->nss = reassoc_req->nss;
+ session_entry->nss_forced_1x1 = reassoc_req->nss_forced_1x1;
+
pe_debug("vhtCapability: %d su_beam_formee: %d su_tx_bformer %d",
session_entry->vhtCapability,
session_entry->vht_config.su_beam_formee,