commit 976e3254b5859d614b82788b8100a1ef45a3f510
author Gopichand Nakkala <gnakkala@qca.qualcomm.com> Thu Jan 03 15:45:56 2013 -0800
committer Gopichand Nakkala <gnakkala@qca.qualcomm.com> Wed Jan 09 15:24:16 2013 -0800
tree 44a612551f7ed38dc2042303ffc861625ee0ab82
parent add701a0b3aa16222eadfe8e318fd6d7a4c61c22

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

CORE/MAC/src/include/sirParams.h

diff --git a/CORE/MAC/src/include/sirParams.h b/CORE/MAC/src/include/sirParams.h
index fe7d1de..d3d690b 100644
--- a/CORE/MAC/src/include/sirParams.h
+++ b/CORE/MAC/src/include/sirParams.h
@@ -94,6 +94,7 @@
    DOT11AC = 2,
    SLM_SESSIONIZATION = 3,
    DOT11AC_OPMODE = 4,
+   SAP32STA = 5,
    TDLS = 6,
    P2P_GO_NOA_DECOUPLE_INIT_SCAN = 7,
    WLANACTIVE_OFFLOAD = 8,