diff options
| author | Vasanthakumar Thiagarajan <vthiagar@qti.qualcomm.com> | 2013-10-31 13:14:00 +0530 |
|---|---|---|
| committer | Madan Mohan Koyyalamudi <mkoyyala@qca.qualcomm.com> | 2013-11-14 19:55:35 -0800 |
| commit | daf2a1516b89c8535928e9b3b9f8ce5f67fcce1a (patch) | |
| tree | af0ff49ef95731e02b5428bf92b0d1e734019c83 | |
| parent | f0be025456c773ca67136129ee06a4639588b0d4 (diff) | |
cld/lim: Send ampdu factor for VHT connection in ADD_BSS
Max Ampdu length exponent advertised in VHT cap of
assoc response is also to be sent to WDA for VHT
association. Currently it is sent only for association
in HT mode.
Change-Id: Iff1a183bd01da6974bab1d9f4a460cbb30991f63
CRs-fixed: 561006
| -rw-r--r-- | CORE/MAC/inc/sirMacProtDef.h | 3 | ||||
| -rw-r--r-- | CORE/MAC/src/pe/lim/limAssocUtils.c | 11 |
2 files changed, 13 insertions, 1 deletions
diff --git a/CORE/MAC/inc/sirMacProtDef.h b/CORE/MAC/inc/sirMacProtDef.h index 02fdd3fc20e9..891b9d268bc4 100644 --- a/CORE/MAC/inc/sirMacProtDef.h +++ b/CORE/MAC/inc/sirMacProtDef.h @@ -620,6 +620,9 @@ #define IS_WES_MODE_ENABLED(x) \ ((x)->roam.configParam.isWESModeEnabled) +#ifdef WLAN_FEATURE_11AC +#define SIR_MAC_GET_VHT_MAX_AMPDU_EXPO(x) ((((tANI_U32) x) & 0x03800000) >> 23) +#endif /// Status Code (present in Management response frames) enum diff --git a/CORE/MAC/src/pe/lim/limAssocUtils.c b/CORE/MAC/src/pe/lim/limAssocUtils.c index 5a09675ecce7..e781fbaa46e5 100644 --- a/CORE/MAC/src/pe/lim/limAssocUtils.c +++ b/CORE/MAC/src/pe/lim/limAssocUtils.c @@ -3283,6 +3283,9 @@ tSirRetStatus limStaSendAddBss( tpAniSirGlobal pMac, tpSirAssocRsp pAssocRsp, vos_mem_copy(&pAddBssParams->staContext.vht_caps, (tANI_U8 *)&pAssocRsp->VHTCaps + sizeof(tANI_U8), sizeof(pAddBssParams->staContext.vht_caps)); + pAddBssParams->staContext.maxAmpduSize = + SIR_MAC_GET_VHT_MAX_AMPDU_EXPO( + pAddBssParams->staContext.vht_caps); } else { @@ -3379,7 +3382,13 @@ tSirRetStatus limStaSendAddBss( tpAniSirGlobal pMac, tpSirAssocRsp pAssocRsp, pAddBssParams->staContext.fDsssCckMode40Mhz = (tANI_U8)pAssocRsp->HTCaps.dsssCckMode40MHz; pAddBssParams->staContext.fShortGI20Mhz = (tANI_U8)pAssocRsp->HTCaps.shortGI20MHz; pAddBssParams->staContext.fShortGI40Mhz = (tANI_U8)pAssocRsp->HTCaps.shortGI40MHz; - pAddBssParams->staContext.maxAmpduSize= pAssocRsp->HTCaps.maxRxAMPDUFactor; +#ifdef WLAN_FEATURE_11AC + if (!pAddBssParams->staContext.vhtCapable) + // Use max ampd factor advertised in HTCAP for non-vht connection +#endif + { + pAddBssParams->staContext.maxAmpduSize= pAssocRsp->HTCaps.maxRxAMPDUFactor; + } if( pAddBssParams->staContext.vhtTxBFCapable && pMac->lim.disableLDPCWithTxbfAP ) { pAddBssParams->staContext.htLdpcCapable = 0; |