diff options
| author | Krishna Kumaar Natarajan <kknatara@qca.qualcomm.com> | 2014-08-14 14:52:14 -0700 |
|---|---|---|
| committer | Pitani Venkata Rajesh Kumar <c_vpitan@qti.qualcomm.com> | 2014-08-20 13:16:53 +0530 |
| commit | 58ca63c3d87ae229783e968e5c85ebe78ebe25e5 (patch) | |
| tree | ddc9cf95fccc13c6ed609a390d2cdea92d992e6a | |
| parent | d23aaae4b7ac8dcf54cdb5877ab47c6f468ba92b (diff) | |
qcacld: Fix to configure gTxBFCsnValue based on the transmt side
Currently gTxBFCsnValue is based on the max value configured for the
STA. This does not take into consideration about the transmit side
This fix will consider the max antenna supported in the transmit
side as well before setting the gTxBFCsnValue.
WNI_CFG_VHT_CSN_BEAMFORMEE_ANT_SUPPORTED_STAMAX is also updated to 4.
Change-Id: If26f49386b72864730679e05559b7bba80b5487a
CRs-Fixed: 709938
| -rw-r--r-- | CORE/HDD/inc/wlan_hdd_cfg.h | 4 | ||||
| -rw-r--r-- | CORE/MAC/inc/wniCfgAp.h | 4 | ||||
| -rw-r--r-- | CORE/MAC/inc/wniCfgSta.h | 2 | ||||
| -rw-r--r-- | CORE/MAC/src/cfg/cfgUtil/cfg.txt | 4 | ||||
| -rw-r--r-- | CORE/SME/src/csr/csrApiRoam.c | 7 | ||||
| -rw-r--r-- | firmware_bin/WCNSS_cfg.dat | bin | 10874 -> 10874 bytes |
6 files changed, 13 insertions, 8 deletions
diff --git a/CORE/HDD/inc/wlan_hdd_cfg.h b/CORE/HDD/inc/wlan_hdd_cfg.h index 0f9a9b90f37d..871446e105ba 100644 --- a/CORE/HDD/inc/wlan_hdd_cfg.h +++ b/CORE/HDD/inc/wlan_hdd_cfg.h @@ -2062,8 +2062,8 @@ typedef enum #define CFG_VHT_CSN_BEAMFORMEE_ANT_SUPPORTED "gTxBFCsnValue" #define CFG_VHT_CSN_BEAMFORMEE_ANT_SUPPORTED_MIN ( WNI_CFG_VHT_CSN_BEAMFORMEE_ANT_SUPPORTED_STAMIN ) -#define CFG_VHT_CSN_BEAMFORMEE_ANT_SUPPORTED_MAX ( WNI_CFG_VHT_CSN_BEAMFORMEE_ANT_SUPPORTED_STAMAX ) -#define CFG_VHT_CSN_BEAMFORMEE_ANT_SUPPORTED_DEFAULT ( WNI_CFG_VHT_CSN_BEAMFORMEE_ANT_SUPPORTED_STAMAX - 1) +#define CFG_VHT_CSN_BEAMFORMEE_ANT_SUPPORTED_MAX ( WNI_CFG_VHT_CSN_BEAMFORMEE_ANT_SUPPORTED_STAMAX - 1 ) +#define CFG_VHT_CSN_BEAMFORMEE_ANT_SUPPORTED_DEFAULT ( WNI_CFG_VHT_CSN_BEAMFORMEE_ANT_SUPPORTED_STAMAX - 1 ) #define CFG_VHT_ENABLE_TXBF_IN_20MHZ "gEnableTxBFin20MHz" #define CFG_VHT_ENABLE_TXBF_IN_20MHZ_MIN ( 0 ) diff --git a/CORE/MAC/inc/wniCfgAp.h b/CORE/MAC/inc/wniCfgAp.h index 985687beec7c..d0cbc87cab8b 100644 --- a/CORE/MAC/inc/wniCfgAp.h +++ b/CORE/MAC/inc/wniCfgAp.h @@ -1643,11 +1643,11 @@ #define WNI_CFG_VHT_SU_BEAMFORMEE_CAP_APDEF 0 #define WNI_CFG_VHT_CSN_BEAMFORMEE_ANT_SUPPORTED_STAMIN 0 -#define WNI_CFG_VHT_CSN_BEAMFORMEE_ANT_SUPPORTED_STAMAX 3 +#define WNI_CFG_VHT_CSN_BEAMFORMEE_ANT_SUPPORTED_STAMAX 4 #define WNI_CFG_VHT_CSN_BEAMFORMEE_ANT_SUPPORTED_STADEF 0 #define WNI_CFG_VHT_CSN_BEAMFORMEE_ANT_SUPPORTED_APMIN 0 -#define WNI_CFG_VHT_CSN_BEAMFORMEE_ANT_SUPPORTED_APMAX 3 +#define WNI_CFG_VHT_CSN_BEAMFORMEE_ANT_SUPPORTED_APMAX 4 #define WNI_CFG_VHT_CSN_BEAMFORMEE_ANT_SUPPORTED_APDEF 0 #define WNI_CFG_VHT_NUM_SOUNDING_DIMENSIONS_STAMIN 0 diff --git a/CORE/MAC/inc/wniCfgSta.h b/CORE/MAC/inc/wniCfgSta.h index daf93bfd9a12..c3c27d2f5d8b 100644 --- a/CORE/MAC/inc/wniCfgSta.h +++ b/CORE/MAC/inc/wniCfgSta.h @@ -1160,7 +1160,7 @@ #define WNI_CFG_VHT_SU_BEAMFORMEE_CAP_STADEF 0 #define WNI_CFG_VHT_CSN_BEAMFORMEE_ANT_SUPPORTED_STAMIN 0 -#define WNI_CFG_VHT_CSN_BEAMFORMEE_ANT_SUPPORTED_STAMAX 3 +#define WNI_CFG_VHT_CSN_BEAMFORMEE_ANT_SUPPORTED_STAMAX 4 #define WNI_CFG_VHT_CSN_BEAMFORMEE_ANT_SUPPORTED_STADEF 0 #define WNI_CFG_VHT_NUM_SOUNDING_DIMENSIONS_STAMIN 0 diff --git a/CORE/MAC/src/cfg/cfgUtil/cfg.txt b/CORE/MAC/src/cfg/cfgUtil/cfg.txt index 8217dbd4a085..d7767e692f4f 100644 --- a/CORE/MAC/src/cfg/cfgUtil/cfg.txt +++ b/CORE/MAC/src/cfg/cfgUtil/cfg.txt @@ -2831,10 +2831,10 @@ LIM WNI_CFG_VHT_CSN_BEAMFORMEE_ANT_SUPPORTED I 4 19 V RW NP LIM -0 3 0 +0 4 0 V RW NP LIM -0 3 0 +0 4 0 * * Number of Sounding Dimensions indicates Number diff --git a/CORE/SME/src/csr/csrApiRoam.c b/CORE/SME/src/csr/csrApiRoam.c index 5e4c1122e436..ec3eb494723a 100644 --- a/CORE/SME/src/csr/csrApiRoam.c +++ b/CORE/SME/src/csr/csrApiRoam.c @@ -12925,6 +12925,7 @@ eHalStatus csrSendJoinReqMsg( tpAniSirGlobal pMac, tANI_U32 sessionId, tSirBssDe tANI_U32 dwTmp; tANI_U8 wpaRsnIE[DOT11F_IE_RSN_MAX_LEN]; //RSN MAX is bigger than WPA MAX tANI_U32 ucDot11Mode = 0; + tANI_U8 txBFCsnValue = 0; if(!pSession) { @@ -13491,7 +13492,11 @@ eHalStatus csrSendJoinReqMsg( tpAniSirGlobal pMac, tANI_U32 sessionId, tSirBssDe pBuf++; // txBFCsnValue - *pBuf = (tANI_U8)pMac->roam.configParam.txBFCsnValue; + txBFCsnValue = (tANI_U8)pMac->roam.configParam.txBFCsnValue; + if (pIes->VHTCaps.present) { + txBFCsnValue = MIN(txBFCsnValue, pIes->VHTCaps.numSoundingDim); + } + *pBuf = txBFCsnValue; pBuf++; // txMuBformee diff --git a/firmware_bin/WCNSS_cfg.dat b/firmware_bin/WCNSS_cfg.dat Binary files differindex f9b4fd875c4a..e34eb71f61a4 100644 --- a/firmware_bin/WCNSS_cfg.dat +++ b/firmware_bin/WCNSS_cfg.dat |