wlan: Merge 32STA Host support changes

Merge 32STA Host support changes to Rel1.2: [APQ8064.LA.1.6 +
MDM9615.TN.3.7] only

Change-Id: Ia8d292fc63860a8f35bf3a0e8144007dd4a7351c
CR-Fixed: 426416

Conflicts:

	prima/CORE/HDD/inc/wlan_hdd_cfg.h
	prima/CORE/HDD/src/wlan_hdd_cfg.c

Conflicts:
	CORE/HDD/inc/wlan_hdd_cfg.h
	CORE/HDD/src/wlan_hdd_cfg.c
diff --git a/CORE/MAC/src/pe/lim/limProcessCfgUpdates.c b/CORE/MAC/src/pe/lim/limProcessCfgUpdates.c
index a98e214..9a0af5f 100644
--- a/CORE/MAC/src/pe/lim/limProcessCfgUpdates.c
+++ b/CORE/MAC/src/pe/lim/limProcessCfgUpdates.c
@@ -829,6 +829,15 @@
     if(wlan_cfgGetInt(pMac, WNI_CFG_ASSOC_STA_LIMIT, &val) != eSIR_SUCCESS) {
         limLog( pMac, LOGP, FL( "cfg get assoc sta limit failed" ));
     }
+    if( (!WDI_getFwWlanFeatCaps(SAP32STA)) && (val >= WNI_CFG_ASSOC_STA_LIMIT_STAMAX))
+    {
+        if(ccmCfgSetInt(pMac, WNI_CFG_ASSOC_STA_LIMIT, WNI_CFG_ASSOC_STA_LIMIT_STADEF,
+            NULL, eANI_BOOLEAN_FALSE) != eHAL_STATUS_SUCCESS)
+        {
+           limLog( pMac, LOGP, FL( "cfg get assoc sta limit failed" )); 
+        }
+        val = WNI_CFG_ASSOC_STA_LIMIT_STADEF;
+    }
     pMac->lim.gLimAssocStaLimit = (tANI_U16)val;
 
 #if defined WLAN_FEATURE_VOWIFI