From ff432cde872b9c33ee1f625a93f174d230bebfee Mon Sep 17 00:00:00 2001
From: Jeff Johnson <jjohnson@codeaurora.org>
Date: Fri, 14 Dec 2018 22:57:41 -0800
Subject: [PATCH] qcacld-3.0: Remove DISABLE_GF_FOR_INTEROP feature code

The DISABLE_GF_FOR_INTEROP feature code in lim_add_sta_self() is old
and non-functional so remove it.

Change-Id: I5e35410b4983794834fb6bbc882a0ba8f5f5e6ef
CRs-Fixed: 2369208
---
 core/mac/src/pe/lim/lim_assoc_utils.c | 106 +++++++++++---------------
 1 file changed, 46 insertions(+), 60 deletions(-)

diff --git a/core/mac/src/pe/lim/lim_assoc_utils.c b/core/mac/src/pe/lim/lim_assoc_utils.c
index 0bc4c7be15aac..7aa1bc447e46d 100644
--- a/core/mac/src/pe/lim/lim_assoc_utils.c
+++ b/core/mac/src/pe/lim/lim_assoc_utils.c
@@ -2769,71 +2769,57 @@ lim_add_sta_self(struct mac_context *mac, uint16_t staIdx, uint8_t updateSta,
 	pAddStaParams->shortPreambleSupported =
 					mac->mlme_cfg->ht_caps.short_preamble;
 
-	lim_populate_own_rate_set(mac, &pAddStaParams->supportedRates, NULL, false,
+	lim_populate_own_rate_set(mac, &pAddStaParams->supportedRates,
+				  NULL, false,
 				  pe_session, NULL, NULL);
 	if (IS_DOT11_MODE_HT(selfStaDot11Mode)) {
 		pAddStaParams->htCapable = true;
-#ifdef DISABLE_GF_FOR_INTEROP
-		if ((pe_session->pLimJoinReq != NULL)
-		    && (!pe_session->pLimJoinReq->bssDescription.
-			aniIndicator)) {
-			pe_err("Turning off Greenfield, when adding self entry");
-			pAddStaParams->greenFieldCapable =
-				WNI_CFG_GREENFIELD_CAPABILITY_DISABLE;
-		} else
-#endif
-		{
-			pAddStaParams->greenFieldCapable =
-				lim_get_ht_capability(mac, eHT_GREENFIELD,
-						      pe_session);
-			pAddStaParams->ch_width =
-				mac->roam.configParam.channelBondingMode5GHz;
-			pAddStaParams->mimoPS =
-				lim_get_ht_capability(mac, eHT_MIMO_POWER_SAVE,
-						      pe_session);
-			pAddStaParams->rifsMode =
-				lim_get_ht_capability(mac, eHT_RIFS_MODE,
-						      pe_session);
-			pAddStaParams->lsigTxopProtection =
-				lim_get_ht_capability(mac, eHT_LSIG_TXOP_PROTECTION,
-						      pe_session);
-			pAddStaParams->maxAmpduDensity =
-				lim_get_ht_capability(mac, eHT_MPDU_DENSITY,
-						      pe_session);
-			pAddStaParams->maxAmpduSize =
-				lim_get_ht_capability(mac, eHT_MAX_RX_AMPDU_FACTOR,
-						      pe_session);
-			pAddStaParams->maxAmsduSize =
-				lim_get_ht_capability(mac, eHT_MAX_AMSDU_LENGTH,
-						      pe_session);
-			pAddStaParams->max_amsdu_num =
-				lim_get_ht_capability(mac, eHT_MAX_AMSDU_NUM,
-						      pe_session);
-			pAddStaParams->fDsssCckMode40Mhz =
-				lim_get_ht_capability(mac, eHT_DSSS_CCK_MODE_40MHZ,
-						      pe_session);
-			pAddStaParams->fShortGI20Mhz =
-					pe_session->htConfig.ht_sgi20;
-			pAddStaParams->fShortGI40Mhz =
-					pe_session->htConfig.ht_sgi40;
-			pe_debug("greenFieldCapable: %d maxAmpduDensity: %d "
-				 "maxAmpduSize: %d",
-				pAddStaParams->greenFieldCapable,
-				pAddStaParams->maxAmpduDensity,
-				pAddStaParams->maxAmpduSize);
+		pAddStaParams->greenFieldCapable =
+			lim_get_ht_capability(mac, eHT_GREENFIELD,
+					      pe_session);
+		pAddStaParams->ch_width =
+			mac->roam.configParam.channelBondingMode5GHz;
+		pAddStaParams->mimoPS =
+			lim_get_ht_capability(mac, eHT_MIMO_POWER_SAVE,
+					      pe_session);
+		pAddStaParams->rifsMode =
+			lim_get_ht_capability(mac, eHT_RIFS_MODE,
+					      pe_session);
+		pAddStaParams->lsigTxopProtection =
+			lim_get_ht_capability(mac, eHT_LSIG_TXOP_PROTECTION,
+					      pe_session);
+		pAddStaParams->maxAmpduDensity =
+			lim_get_ht_capability(mac, eHT_MPDU_DENSITY,
+					      pe_session);
+		pAddStaParams->maxAmpduSize =
+			lim_get_ht_capability(mac, eHT_MAX_RX_AMPDU_FACTOR,
+					      pe_session);
+		pAddStaParams->maxAmsduSize =
+			lim_get_ht_capability(mac, eHT_MAX_AMSDU_LENGTH,
+					      pe_session);
+		pAddStaParams->max_amsdu_num =
+			lim_get_ht_capability(mac, eHT_MAX_AMSDU_NUM,
+					      pe_session);
+		pAddStaParams->fDsssCckMode40Mhz =
+			lim_get_ht_capability(mac, eHT_DSSS_CCK_MODE_40MHZ,
+					      pe_session);
+		pAddStaParams->fShortGI20Mhz = pe_session->htConfig.ht_sgi20;
+		pAddStaParams->fShortGI40Mhz = pe_session->htConfig.ht_sgi40;
+		pe_debug("greenFieldCapable: %d maxAmpduDensity: %d maxAmpduSize: %d",
+			 pAddStaParams->greenFieldCapable,
+			 pAddStaParams->maxAmpduDensity,
+			 pAddStaParams->maxAmpduSize);
 
-			pe_debug("fDsssCckMode40Mhz: %d fShortGI20Mhz: %d "
-				 "fShortGI40Mhz: %d lsigTxopProtection: %d",
-				pAddStaParams->fDsssCckMode40Mhz,
-				pAddStaParams->fShortGI20Mhz,
-				pAddStaParams->fShortGI40Mhz,
-				pAddStaParams->lsigTxopProtection);
+		pe_debug("fDsssCckMode40Mhz: %d fShortGI20Mhz: %d fShortGI40Mhz: %d lsigTxopProtection: %d",
+			 pAddStaParams->fDsssCckMode40Mhz,
+			 pAddStaParams->fShortGI20Mhz,
+			 pAddStaParams->fShortGI40Mhz,
+			 pAddStaParams->lsigTxopProtection);
 
-			pe_debug("maxAmsduSize: %d txChannelWidth: %d mimoPS: %d rifsMode %d",
-				pAddStaParams->maxAmsduSize,
-				pAddStaParams->ch_width,
-				pAddStaParams->mimoPS, pAddStaParams->rifsMode);
-		}
+		pe_debug("maxAmsduSize: %d txChannelWidth: %d mimoPS: %d rifsMode %d",
+			 pAddStaParams->maxAmsduSize,
+			 pAddStaParams->ch_width,
+			 pAddStaParams->mimoPS, pAddStaParams->rifsMode);
 	}
 	pAddStaParams->vhtCapable = IS_DOT11_MODE_VHT(selfStaDot11Mode);
 	if (pAddStaParams->vhtCapable) {