commit b01ac95f038fbcff41d9b823ec871d50b131445c
author Abhishek Singh <absingh@codeaurora.org> Thu Aug 17 13:52:23 2017 +0530
committer Anjaneedevi Kapparapu <akappara@codeaurora.org> Wed Aug 30 10:42:40 2017 -0700
tree 07ec544a860e6bbc27a859686b7faa7e9aeeb207
parent a57f7ac7120447234b8642b4c25a916ecaa8b1a9

qcacld-3.0: Initiate connection in with 2x2 even if antenna is shared by LTE

If STA LTE antenna sharing is enabled sometime STA connect with NSS1
even AP is broadcasting NSS 2 capability if the chainmask received in
vdev start resp indicate 1x1. But the connection should be 2x2 and
after association the chainmask mgr will drop it down to 1x1.

Thus initiate connection in with 2x2 even if antenna is shared by LTE
during connection initiation.

Change-Id: Ia31d1ac3a0a5dcafe62e43f122fc81f655cdba63
CRs-Fixed: 2094177

core/mac/src/pe/lim/lim_assoc_utils.c

diff --git a/core/mac/src/pe/lim/lim_assoc_utils.c b/core/mac/src/pe/lim/lim_assoc_utils.c
index 50bc28e..f33dd7b 100644
--- a/core/mac/src/pe/lim/lim_assoc_utils.c
+++ b/core/mac/src/pe/lim/lim_assoc_utils.c
@@ -1403,18 +1403,8 @@
 		QDF_MIN(rates->vhtRxHighestDataRate,
 			peer_vht_caps->rxHighSupDataRate);
 
-	if (session_entry && session_entry->nss == NSS_2x2_MODE) {
-		if (mac_ctx->lteCoexAntShare &&
-			IS_24G_CH(session_entry->currentOperChannel)) {
-			if (IS_2X2_CHAIN(session_entry->chainMask))
-				mcs_map_mask2x2 = MCSMAPMASK2x2;
-			else
-				pe_err("2x2 not enabled %d",
-					session_entry->chainMask);
-		} else {
-			mcs_map_mask2x2 = MCSMAPMASK2x2;
-		}
-	}
+	if (session_entry && session_entry->nss == NSS_2x2_MODE)
+		mcs_map_mask2x2 = MCSMAPMASK2x2;
 
 	if ((peer_vht_caps->txMCSMap & mcs_map_mask) <
 	    (rates->vhtRxMCSMap & mcs_map_mask)) {

core/mac/src/sys/legacy/src/utils/src/parser_api.c

diff --git a/core/mac/src/sys/legacy/src/utils/src/parser_api.c b/core/mac/src/sys/legacy/src/utils/src/parser_api.c
index 45778c9..88b0ecf 100644
--- a/core/mac/src/sys/legacy/src/utils/src/parser_api.c
+++ b/core/mac/src/sys/legacy/src/utils/src/parser_api.c
@@ -681,17 +681,6 @@
 				pMac->roam.configParam.disable_high_ht_mcs_2x2;
 		pe_debug("disable HT high MCS INI param[%d]",
 			 disable_high_ht_mcs_2x2);
-
-		if (pMac->lteCoexAntShare
-		    && (IS_24G_CH(psessionEntry->currentOperChannel))) {
-			if (!(IS_2X2_CHAIN(psessionEntry->chainMask))) {
-				pDot11f->supportedMCSSet[1] = 0;
-				if (LIM_IS_STA_ROLE(psessionEntry)) {
-					pDot11f->mimoPowerSave =
-						psessionEntry->smpsMode;
-				}
-			}
-		}
 		if (psessionEntry->nss == NSS_1x1_MODE) {
 			pDot11f->supportedMCSSet[1] = 0;
 		} else if (IS_24G_CH(psessionEntry->currentOperChannel) &&
@@ -1069,13 +1058,6 @@
 
 	pDot11f->reserved3 = 0;
 	if (psessionEntry) {
-		if (pMac->lteCoexAntShare
-		    && (IS_24G_CH(psessionEntry->currentOperChannel))) {
-			if (!(IS_2X2_CHAIN(psessionEntry->chainMask))) {
-				pDot11f->txMCSMap |= DISABLE_NSS2_MCS;
-				pDot11f->rxMCSMap |= DISABLE_NSS2_MCS;
-			}
-		}
 		if (psessionEntry->nss == NSS_1x1_MODE) {
 			pDot11f->txMCSMap |= DISABLE_NSS2_MCS;
 			pDot11f->rxMCSMap |= DISABLE_NSS2_MCS;