prima: Encode all the supported rates in TDLS frames
Currently STA advertise supported rates based on the session
capability. If STA is 11n capable, but if it is connected to
11b AP then it advertises only 11b rates.
This change set fixes the issue by advertising all the rates
supported by the STA.
Change-Id: I40fcba985b010ff0a244f53c4642fa2be4448863
CRs-Fixed: 789887
diff --git a/CORE/MAC/inc/sirApi.h b/CORE/MAC/inc/sirApi.h
index 920481e..657a200 100644
--- a/CORE/MAC/inc/sirApi.h
+++ b/CORE/MAC/inc/sirApi.h
@@ -5676,4 +5676,7 @@
eSIR_ABORT_SCAN_FAILURE
}tSirAbortScanStatus;
+/* Max number of rates allowed in Supported Rates IE */
+#define MAX_NUM_SUPPORTED_RATES (8)
+
#endif /* __SIR_API_H */
diff --git a/CORE/MAC/src/include/parserApi.h b/CORE/MAC/src/include/parserApi.h
index b01d66a..ad5bf5b 100644
--- a/CORE/MAC/src/include/parserApi.h
+++ b/CORE/MAC/src/include/parserApi.h
@@ -730,6 +730,10 @@
tANI_U8 nChannelNum,
tDot11fIESuppRates *pDot11f,tpPESession);
+tSirRetStatus
+PopulateDot11fRatesTdls(tpAniSirGlobal p_mac,
+ tDot11fIESuppRates *p_supp_rates,
+ tDot11fIEExtSuppRates *p_ext_supp_rates);
tSirRetStatus PopulateDot11fTPCReport(tpAniSirGlobal pMac,
tDot11fIETPCReport *pDot11f,
diff --git a/CORE/MAC/src/pe/lim/limProcessTdls.c b/CORE/MAC/src/pe/lim/limProcessTdls.c
index 7e8fa7d..491776c 100644
--- a/CORE/MAC/src/pe/lim/limProcessTdls.c
+++ b/CORE/MAC/src/pe/lim/limProcessTdls.c
@@ -1051,7 +1051,7 @@
tANI_U16 addIeLen)
{
tDot11fTDLSDisRsp tdlsDisRsp ;
- tANI_U16 caps = 0 ;
+ tANI_U16 caps = 0 ;
tANI_U32 status = 0 ;
tANI_U32 nPayload = 0 ;
tANI_U32 nBytes = 0 ;
@@ -1065,7 +1065,7 @@
// As of now, we hardcoded to max channel bonding of dot11Mode (i.e HT80 for 11ac/HT40 for 11n)
// uint32 tdlsChannelBondingMode;
- /*
+ /*
* The scheme here is to fill out a 'tDot11fProbeRequest' structure
* and then hand it off to 'dot11fPackProbeRequest' (for
* serialization). We start by zero-initializing the structure:
@@ -1080,7 +1080,7 @@
tdlsDisRsp.Action.action = SIR_MAC_TDLS_DIS_RSP ;
tdlsDisRsp.DialogToken.token = dialog ;
- PopulateDot11fLinkIden( pMac, psessionEntry, &tdlsDisRsp.LinkIdentifier,
+ PopulateDot11fLinkIden( pMac, psessionEntry, &tdlsDisRsp.LinkIdentifier,
peerMac, TDLS_RESPONDER) ;
if (cfgGetCapabilityInfo(pMac, &caps, psessionEntry) != eSIR_SUCCESS)
@@ -1093,15 +1093,12 @@
}
swapBitField16(caps, ( tANI_U16* )&tdlsDisRsp.Capabilities );
- /* populate supported rate IE */
- PopulateDot11fSuppRates( pMac, POPULATE_DOT11F_RATES_OPERATIONAL,
- &tdlsDisRsp.SuppRates, psessionEntry );
-
- /* Populate extended supported rates */
- PopulateDot11fExtSuppRates( pMac, POPULATE_DOT11F_RATES_OPERATIONAL,
- &tdlsDisRsp.ExtSuppRates, psessionEntry );
+ /* populate supported rate and ext supported rate IE */
+ if (eSIR_FAILURE == PopulateDot11fRatesTdls(pMac, &tdlsDisRsp.SuppRates,
+ &tdlsDisRsp.ExtSuppRates))
+ limLog(pMac, LOGE, FL("could not populate supported data rates"));
- /* Populate extended supported rates */
+ /* Populate extended capability IE */
PopulateDot11fTdlsExtCapability( pMac, &tdlsDisRsp.ExtCap );
wlan_cfgGetInt(pMac,WNI_CFG_DOT11_MODE,&selfDot11Mode);
@@ -1360,15 +1357,11 @@
swapBitField16(caps, ( tANI_U16* )&tdlsSetupReq.Capabilities );
- /* populate supported rate IE */
- PopulateDot11fSuppRates( pMac, POPULATE_DOT11F_RATES_OPERATIONAL,
- &tdlsSetupReq.SuppRates, psessionEntry );
+ /* populate supported rate and ext supported rate IE */
+ PopulateDot11fRatesTdls(pMac, &tdlsSetupReq.SuppRates,
+ &tdlsSetupReq.ExtSuppRates);
- /* Populate extended supported rates */
- PopulateDot11fExtSuppRates( pMac, POPULATE_DOT11F_RATES_OPERATIONAL,
- &tdlsSetupReq.ExtSuppRates, psessionEntry );
-
- /* Populate extended supported rates */
+ /* Populate extended capability IE */
PopulateDot11fTdlsExtCapability( pMac, &tdlsSetupReq.ExtCap );
if ( 1 == pMac->lim.gLimTDLSWmmMode )
@@ -1751,13 +1744,13 @@
/*
* Send Setup RSP frame on AP link.
*/
-static tSirRetStatus limSendTdlsSetupRspFrame(tpAniSirGlobal pMac,
- tSirMacAddr peerMac, tANI_U8 dialog, tpPESession psessionEntry,
+static tSirRetStatus limSendTdlsSetupRspFrame(tpAniSirGlobal pMac,
+ tSirMacAddr peerMac, tANI_U8 dialog, tpPESession psessionEntry,
etdlsLinkSetupStatus setupStatus, tANI_U8 *addIe, tANI_U16 addIeLen )
{
tDot11fTDLSSetupRsp tdlsSetupRsp ;
tANI_U32 status = 0 ;
- tANI_U16 caps = 0 ;
+ tANI_U16 caps = 0 ;
tANI_U32 nPayload = 0 ;
tANI_U32 header_offset = 0 ;
tANI_U32 nBytes = 0 ;
@@ -1772,7 +1765,7 @@
// As of now, we hardcoded to max channel bonding of dot11Mode (i.e HT80 for 11ac/HT40 for 11n)
// uint32 tdlsChannelBondingMode;
- /*
+ /*
* The scheme here is to fill out a 'tDot11fProbeRequest' structure
* and then hand it off to 'dot11fPackProbeRequest' (for
* serialization). We start by zero-initializing the structure:
@@ -1804,15 +1797,11 @@
swapBitField16(caps, ( tANI_U16* )&tdlsSetupRsp.Capabilities );
- /* ipopulate supported rate IE */
- PopulateDot11fSuppRates( pMac, POPULATE_DOT11F_RATES_OPERATIONAL,
- &tdlsSetupRsp.SuppRates, psessionEntry );
-
- /* Populate extended supported rates */
- PopulateDot11fExtSuppRates( pMac, POPULATE_DOT11F_RATES_OPERATIONAL,
- &tdlsSetupRsp.ExtSuppRates, psessionEntry );
+ /* populate supported rate and ext supported rate IE */
+ PopulateDot11fRatesTdls(pMac, &tdlsSetupRsp.SuppRates,
+ &tdlsSetupRsp.ExtSuppRates);
- /* Populate extended supported rates */
+ /* Populate extended capability IE */
PopulateDot11fTdlsExtCapability( pMac, &tdlsSetupRsp.ExtCap );
if ( 1 == pMac->lim.gLimTDLSWmmMode )
diff --git a/CORE/SYS/legacy/src/utils/src/parserApi.c b/CORE/SYS/legacy/src/utils/src/parserApi.c
index f35d62b..5732ce6 100644
--- a/CORE/SYS/legacy/src/utils/src/parserApi.c
+++ b/CORE/SYS/legacy/src/utils/src/parserApi.c
@@ -1538,6 +1538,112 @@
} // End PopulateDot11fSuppRates.
+/**
+ * PopulateDot11fRatesTdls() - populate supported rates and
+ * extended supported rates IE.
+ * @p_mac gloabl - header.
+ * @p_supp_rates - pointer to supported rates IE
+ * @p_ext_supp_rates - pointer to extended supported rates IE
+ *
+ * This function populates the supported rates and extended supported
+ * rates IE based in the STA capability. If the number of rates
+ * supported is less than MAX_NUM_SUPPORTED_RATES, only supported rates
+ * IE is populated.
+ *
+ * Return: tSirRetStatus eSIR_SUCCESS on Success and eSIR_FAILURE
+ * on failure.
+ */
+
+tSirRetStatus
+PopulateDot11fRatesTdls(tpAniSirGlobal p_mac,
+ tDot11fIESuppRates *p_supp_rates,
+ tDot11fIEExtSuppRates *p_ext_supp_rates)
+{
+ tSirMacRateSet temp_rateset;
+ tSirMacRateSet temp_rateset2;
+ uint32_t val, i;
+ uint32_t self_dot11mode = 0;
+
+ wlan_cfgGetInt(p_mac, WNI_CFG_DOT11_MODE, &self_dot11mode);
+
+ /**
+ * Include 11b rates only when the device configured in
+ * auto, 11a/b/g or 11b_only
+ */
+ if ((self_dot11mode == WNI_CFG_DOT11_MODE_ALL) ||
+ (self_dot11mode == WNI_CFG_DOT11_MODE_11A) ||
+ (self_dot11mode == WNI_CFG_DOT11_MODE_11AC) ||
+ (self_dot11mode == WNI_CFG_DOT11_MODE_11N) ||
+ (self_dot11mode == WNI_CFG_DOT11_MODE_11G) ||
+ (self_dot11mode == WNI_CFG_DOT11_MODE_11B) )
+ {
+ val = WNI_CFG_SUPPORTED_RATES_11B_LEN;
+ wlan_cfgGetStr(p_mac, WNI_CFG_SUPPORTED_RATES_11B,
+ (tANI_U8 *)&temp_rateset.rate, &val);
+ temp_rateset.numRates = (tANI_U8) val;
+ }
+ else
+ {
+ temp_rateset.numRates = 0;
+ }
+
+ /* Include 11a rates when the device configured in non-11b mode */
+ if (!IS_DOT11_MODE_11B(self_dot11mode))
+ {
+ val = WNI_CFG_SUPPORTED_RATES_11A_LEN;
+ wlan_cfgGetStr(p_mac, WNI_CFG_SUPPORTED_RATES_11A,
+ (tANI_U8 *)&temp_rateset2.rate, &val);
+ temp_rateset2.numRates = (tANI_U8) val;
+ }
+ else
+ {
+ temp_rateset2.numRates = 0;
+ }
+
+ if ((temp_rateset.numRates + temp_rateset2.numRates) >
+ SIR_MAC_MAX_NUMBER_OF_RATES)
+ {
+ limLog(p_mac, LOGP, FL("more than %d rates in CFG"),
+ SIR_MAC_MAX_NUMBER_OF_RATES);
+ return eSIR_FAILURE;
+ }
+
+ /**
+ * copy all rates in temp_rateset,
+ * there are SIR_MAC_MAX_NUMBER_OF_RATES rates max
+ */
+ for (i = 0; i < temp_rateset2.numRates; i++)
+ temp_rateset.rate[i + temp_rateset.numRates] =
+ temp_rateset2.rate[i];
+
+ temp_rateset.numRates += temp_rateset2.numRates;
+
+ if (temp_rateset.numRates <= MAX_NUM_SUPPORTED_RATES)
+ {
+ p_supp_rates->num_rates = temp_rateset.numRates;
+ vos_mem_copy(p_supp_rates->rates, temp_rateset.rate,
+ p_supp_rates->num_rates);
+ p_supp_rates->present = 1;
+ }
+ else /* Populate extended capability as well */
+ {
+ p_supp_rates->num_rates = MAX_NUM_SUPPORTED_RATES;
+ vos_mem_copy(p_supp_rates->rates, temp_rateset.rate,
+ p_supp_rates->num_rates);
+ p_supp_rates->present = 1;
+ p_ext_supp_rates->num_rates = temp_rateset.numRates -
+ MAX_NUM_SUPPORTED_RATES;
+ vos_mem_copy(p_ext_supp_rates->rates,
+ (tANI_U8 *)temp_rateset.rate +
+ MAX_NUM_SUPPORTED_RATES,
+ p_ext_supp_rates->num_rates);
+ p_ext_supp_rates->present = 1;
+ }
+
+ return eSIR_SUCCESS;
+
+} /* End PopulateDot11fRatesTdls */
+
tSirRetStatus
PopulateDot11fTPCReport(tpAniSirGlobal pMac,
tDot11fIETPCReport *pDot11f,