wlan:check for duplicate rates
Currently, if AP advertize the same rate in supported
and extended supported rate, driver takes that rate
in both the supported and extended supported rates.
This was crossing the max number of rates
which is 12 and leading to crash.To fix it include
check for any duplicate rates if exists then consider
once.
Change-Id: I073ee2ddf2b983865a329f51768bffdf4ca11c42
CRs-Fixed: 775179
diff --git a/CORE/MAC/inc/sirMacProtDef.h b/CORE/MAC/inc/sirMacProtDef.h
index 42722e8..897f14c 100644
--- a/CORE/MAC/inc/sirMacProtDef.h
+++ b/CORE/MAC/inc/sirMacProtDef.h
@@ -2780,6 +2780,18 @@
#define SIR_MAC_RATE_216 1006
#define SIR_MAC_RATE_240 1007
+#define SIR_MAC_RATE_1_BITMAP (1<<0)
+#define SIR_MAC_RATE_2_BITMAP (1<<1)
+#define SIR_MAC_RATE_5_5_BITMAP (1<<2)
+#define SIR_MAC_RATE_11_BITMAP (1<<3)
+#define SIR_MAC_RATE_6_BITMAP (1<<4)
+#define SIR_MAC_RATE_9_BITMAP (1<<5)
+#define SIR_MAC_RATE_12_BITMAP (1<<6)
+#define SIR_MAC_RATE_18_BITMAP (1<<7)
+#define SIR_MAC_RATE_24_BITMAP (1<<8)
+#define SIR_MAC_RATE_36_BITMAP (1<<9)
+#define SIR_MAC_RATE_48_BITMAP (1<<10)
+#define SIR_MAC_RATE_54_BITMAP (1<<11)
#define sirIsArate(x) ((((tANI_U8)x)==SIR_MAC_RATE_6) || \
(((tANI_U8)x)==SIR_MAC_RATE_9) || \
diff --git a/CORE/SME/inc/csrSupport.h b/CORE/SME/inc/csrSupport.h
index 314feae..28c775a 100644
--- a/CORE/SME/inc/csrSupport.h
+++ b/CORE/SME/inc/csrSupport.h
@@ -784,6 +784,10 @@
tANI_BOOLEAN csrIsBssidMatch( tHalHandle hHal, tCsrBssid *pProfBssid, tCsrBssid *BssBssid );
tANI_BOOLEAN csrMatchBSSToConnectProfile( tHalHandle hHal, tCsrRoamConnectedProfile *pProfile,
tSirBssDescription *pBssDesc, tDot11fBeaconIEs *pIes );
+
+void csrAddRateBitmap(tANI_U8 rate, tANI_U16 *pRateBitmap);
+tANI_BOOLEAN csrIsRateAlreadyPresent(tANI_U8 rate, tANI_U16 RateBitmap);
+
tANI_BOOLEAN csrRatesIsDot11RateSupported( tHalHandle hHal, tANI_U8 rate );
tANI_U16 csrRatesFindBestRate( tSirMacRateSet *pSuppRates, tSirMacRateSet *pExtRates, tSirMacPropRateSet *pPropRates );
tSirBssType csrTranslateBsstypeToMacType(eCsrRoamBssType csrtype);
diff --git a/CORE/SME/src/csr/csrApiRoam.c b/CORE/SME/src/csr/csrApiRoam.c
index 843c738..89df25e 100644
--- a/CORE/SME/src/csr/csrApiRoam.c
+++ b/CORE/SME/src/csr/csrApiRoam.c
@@ -3502,6 +3502,7 @@
int i;
eCsrCfgDot11Mode cfgDot11Mode;
tANI_U8 *pDstRate;
+ tANI_U16 rateBitmap = 0;
vos_mem_set(pOpRateSet, sizeof(tSirMacRateSet), 0);
vos_mem_set(pExRateSet, sizeof(tSirMacRateSet), 0);
VOS_ASSERT( pIes != NULL );
@@ -3525,6 +3526,7 @@
{
if ( csrRatesIsDot11RateSupported( pMac, pIes->SuppRates.rates[ i ] ) )
{
+ csrAddRateBitmap(pIes->SuppRates.rates[ i ], &rateBitmap);
*pDstRate++ = pIes->SuppRates.rates[ i ];
pOpRateSet->numRates++;
}
@@ -3545,8 +3547,11 @@
{
if ( csrRatesIsDot11RateSupported( pMac, pIes->ExtSuppRates.rates[ i ] ) )
{
- *pDstRate++ = pIes->ExtSuppRates.rates[ i ];
- pExRateSet->numRates++;
+ if (!csrIsRateAlreadyPresent(pIes->ExtSuppRates.rates[ i ], rateBitmap))
+ {
+ *pDstRate++ = pIes->ExtSuppRates.rates[ i ];
+ pExRateSet->numRates++;
+ }
}
}
}
diff --git a/CORE/SME/src/csr/csrUtil.c b/CORE/SME/src/csr/csrUtil.c
index 730e440..329b0d5 100644
--- a/CORE/SME/src/csr/csrUtil.c
+++ b/CORE/SME/src/csr/csrUtil.c
@@ -5826,6 +5826,103 @@
+void csrAddRateBitmap(tANI_U8 rate, tANI_U16 *pRateBitmap)
+{
+ tANI_U16 rateBitmap;
+ tANI_U16 n = BITS_OFF( rate, CSR_DOT11_BASIC_RATE_MASK );
+ rateBitmap = *pRateBitmap;
+ switch(n)
+ {
+ case SIR_MAC_RATE_1:
+ rateBitmap |= SIR_MAC_RATE_1_BITMAP;
+ break;
+ case SIR_MAC_RATE_2:
+ rateBitmap |= SIR_MAC_RATE_2_BITMAP;
+ break;
+ case SIR_MAC_RATE_5_5:
+ rateBitmap |= SIR_MAC_RATE_5_5_BITMAP;
+ break;
+ case SIR_MAC_RATE_11:
+ rateBitmap |= SIR_MAC_RATE_11_BITMAP;
+ break;
+ case SIR_MAC_RATE_6:
+ rateBitmap |= SIR_MAC_RATE_6_BITMAP;
+ break;
+ case SIR_MAC_RATE_9:
+ rateBitmap |= SIR_MAC_RATE_9_BITMAP;
+ break;
+ case SIR_MAC_RATE_12:
+ rateBitmap |= SIR_MAC_RATE_12_BITMAP;
+ break;
+ case SIR_MAC_RATE_18:
+ rateBitmap |= SIR_MAC_RATE_18_BITMAP;
+ break;
+ case SIR_MAC_RATE_24:
+ rateBitmap |= SIR_MAC_RATE_24_BITMAP;
+ break;
+ case SIR_MAC_RATE_36:
+ rateBitmap |= SIR_MAC_RATE_36_BITMAP;
+ break;
+ case SIR_MAC_RATE_48:
+ rateBitmap |= SIR_MAC_RATE_48_BITMAP;
+ break;
+ case SIR_MAC_RATE_54:
+ rateBitmap |= SIR_MAC_RATE_54_BITMAP;
+ break;
+ }
+ *pRateBitmap = rateBitmap;
+}
+
+
+
+tANI_BOOLEAN csrIsRateAlreadyPresent(tANI_U8 rate, tANI_U16 rateBitmap)
+{
+ tANI_U16 n = BITS_OFF( rate, CSR_DOT11_BASIC_RATE_MASK );
+
+ switch(n)
+ {
+ case SIR_MAC_RATE_1:
+ rateBitmap &= SIR_MAC_RATE_1_BITMAP;
+ break;
+ case SIR_MAC_RATE_2:
+ rateBitmap &= SIR_MAC_RATE_2_BITMAP;
+ break;
+ case SIR_MAC_RATE_5_5:
+ rateBitmap &= SIR_MAC_RATE_5_5_BITMAP;
+ break;
+ case SIR_MAC_RATE_11:
+ rateBitmap &= SIR_MAC_RATE_11_BITMAP;
+ break;
+ case SIR_MAC_RATE_6:
+ rateBitmap &= SIR_MAC_RATE_6_BITMAP;
+ break;
+ case SIR_MAC_RATE_9:
+ rateBitmap &= SIR_MAC_RATE_9_BITMAP;
+ break;
+ case SIR_MAC_RATE_12:
+ rateBitmap &= SIR_MAC_RATE_12_BITMAP;
+ break;
+ case SIR_MAC_RATE_18:
+ rateBitmap &= SIR_MAC_RATE_18_BITMAP;
+ break;
+ case SIR_MAC_RATE_24:
+ rateBitmap &= SIR_MAC_RATE_24_BITMAP;
+ break;
+ case SIR_MAC_RATE_36:
+ rateBitmap &= SIR_MAC_RATE_36_BITMAP;
+ break;
+ case SIR_MAC_RATE_48:
+ rateBitmap &= SIR_MAC_RATE_48_BITMAP;
+ break;
+ case SIR_MAC_RATE_54:
+ rateBitmap &= SIR_MAC_RATE_54_BITMAP;
+ break;
+ }
+ return !!rateBitmap;
+}
+
+
+
tANI_BOOLEAN csrRatesIsDot11RateSupported( tHalHandle hHal, tANI_U8 rate )
{
tpAniSirGlobal pMac = PMAC_STRUCT( hHal );