From 6a7d1eb99ae36463c6dd2c850e7db9c3ba25fb58 Mon Sep 17 00:00:00 2001 From: Kiran Kumar Lokere Date: Mon, 2 May 2016 18:31:35 -0700 Subject: [PATCH] qcacld-3.0: Fix issue in IBSS Nss configuration qcacld-2.0 to qcacld-3.0 propagation Populate the per band vdev nss values of IBSS in add bss parameters since the IBSS vdev is created as part of IBSS add bss Update the INI with per band chain mask and Nss parameters Change-Id: Ie87f11aaa7166940296af0dcee3d7a32942e3779 CRs-Fixed: 882283 --- config/WCNSS_qcom_cfg.ini | 15 +++++++++++++++ .../mac/src/pe/lim/lim_process_mlm_req_messages.c | 4 ++++ 2 files changed, 19 insertions(+) diff --git a/config/WCNSS_qcom_cfg.ini b/config/WCNSS_qcom_cfg.ini index 51a4cc7b9559..27535bdd21a3 100644 --- a/config/WCNSS_qcom_cfg.ini +++ b/config/WCNSS_qcom_cfg.ini @@ -335,6 +335,21 @@ gEnable2x2=1 gVhtRxMCS2x2=2 gVhtTxMCS2x2=2 +# NSS cfg bit definition. +# STA BIT[0:1] +# SAP BIT[2:3] +# P2P_GO BIT[4:5] +# P2P_CLIENT BIT[6:7] +# IBSS BIT[8:9] +# TDLS BIT[10:11] +# P2P_DEVICE BIT[12:13] +# OCB BIT[14:15] +# Valid values are 1 or 2 for each two bit configuration. +# if 2-bit value is set to 1 then the corresponidng vdev comes up in 1x1 mode +# in the band, if set to 2 then that vdev comes up in 2x2 mode in that band. +gVdevTypeNss_2g=43690 +gVdevTypeNss_5g=43690 + # Set txchainmask and rxchainmask # These parameters are used only if gEnable2x2 is 0 # Valid values are 1,2 diff --git a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c index fb43f581a2f7..e3a1c2688039 100644 --- a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c @@ -693,6 +693,10 @@ lim_mlm_add_bss(tpAniSirGlobal mac_ctx, addbss_param->dot11_mode = session->dot11mode; addbss_param->nss = session->nss; + if (QDF_IBSS_MODE == addbss_param->halPersona) { + addbss_param->nss_2g = mac_ctx->vdev_type_nss_2g.ibss; + addbss_param->nss_5g = mac_ctx->vdev_type_nss_5g.ibss; + } lim_log(mac_ctx, LOG2, FL("dot11_mode:%d nss value:%d"), addbss_param->dot11_mode, addbss_param->nss);