summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbhinav Kumar <abhikuma@codeaurora.org>2018-06-29 15:01:58 +0530
committernshrivas <nshrivas@codeaurora.org>2018-06-29 10:43:16 -0700
commit5c5146f0331a31e3001aed5bc03eaf0abfbc6d03 (patch)
tree8a4615aec47f3783b6200e1ba3e674e30c4518f5
parent6f2b5463995505b8197b80b26c99afe7e56296cc (diff)
qcacld-3.0: Revert "qcacld-3.0:Fix the IOT issue with TxBF CSN value"
This reverts The Change-Id: Ifa2872ef62925f99bf49ef504ade4a4bb431672b because this change results slower down the downloading speed of file from the server in weak signal (-70 RSSI) area. Change-Id: Iec7423809f5225de9b5c4d08d7806a8a2a9dfe06 CRs-Fixed: 2270285
-rw-r--r--core/sme/src/csr/csr_api_roam.c22
1 files changed, 12 insertions, 10 deletions
diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c
index 5524132730b2..cc358fa94774 100644
--- a/core/sme/src/csr/csr_api_roam.c
+++ b/core/sme/src/csr/csr_api_roam.c
@@ -15702,7 +15702,6 @@ QDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId,
uint32_t value = 0, value1 = 0;
QDF_STATUS packetdump_timer_status;
enum hw_mode_dbs_capab hw_mode_to_use;
- tDot11fIEVHTCaps *vht_caps = NULL;
bool is_vendor_ap_present;
struct vdev_type_nss *vdev_type_nss;
@@ -16323,12 +16322,8 @@ QDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId,
csr_join_req->vht_config.su_beam_formee = value;
- if (pIes->VHTCaps.present)
- vht_caps = &pIes->VHTCaps;
- else if (pIes->vendor_vht_ie.VHTCaps.present)
- vht_caps = &pIes->vendor_vht_ie.VHTCaps;
/* Set BF CSN value only if SU Bformee is enabled */
- if (vht_caps && csr_join_req->vht_config.su_beam_formee) {
+ if (csr_join_req->vht_config.su_beam_formee) {
txBFCsnValue = (uint8_t)value1;
/*
* Certain commercial AP display a bad behavior when
@@ -16338,11 +16333,18 @@ QDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId,
* CSN cap of less than 4. To avoid such issues, take a
* min of self and peer CSN while sending ASSOC request.
*/
- if (pIes->Vendor1IE.present &&
- vht_caps->csnofBeamformerAntSup < 4) {
- if (vht_caps->csnofBeamformerAntSup)
+ if (txBFCsnValue < 4) {
+ if (IS_BSS_VHT_CAPABLE(pIes->VHTCaps) &&
+ pIes->VHTCaps.csnofBeamformerAntSup)
txBFCsnValue = QDF_MIN(txBFCsnValue,
- vht_caps->csnofBeamformerAntSup);
+ pIes->VHTCaps.csnofBeamformerAntSup);
+ else if (IS_BSS_VHT_CAPABLE(
+ pIes->vendor_vht_ie.VHTCaps)
+ && pIes->vendor_vht_ie.VHTCaps.
+ csnofBeamformerAntSup)
+ txBFCsnValue = QDF_MIN(txBFCsnValue,
+ pIes->vendor_vht_ie.
+ VHTCaps.csnofBeamformerAntSup);
}
}
csr_join_req->vht_config.csnof_beamformer_antSup = txBFCsnValue;