prima: Do not include 11b rates in TDLS setup request
If base channel is 5 GHz and when we support all 11a and 11g
rates, then there is no need to advertise 11b rates in TDLS setup
request/response frames.
Advertising 11b rates also leading to IOT issues with few third
party devices.
Fix is to ensure that 11b rates are not included if base channel is
5ghz.
Change-Id: I45590a4067194e8929bac225b1a82ec510903539
CRs-Fixed: 955788
diff --git a/CORE/MAC/src/include/parserApi.h b/CORE/MAC/src/include/parserApi.h
index 0b2192c..e36227b 100644
--- a/CORE/MAC/src/include/parserApi.h
+++ b/CORE/MAC/src/include/parserApi.h
@@ -734,7 +734,8 @@
tSirRetStatus
PopulateDot11fRatesTdls(tpAniSirGlobal p_mac,
tDot11fIESuppRates *p_supp_rates,
- tDot11fIEExtSuppRates *p_ext_supp_rates);
+ tDot11fIEExtSuppRates *p_ext_supp_rates,
+ tANI_U8 curr_oper_channel);
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 e949a53..e861a67 100644
--- a/CORE/MAC/src/pe/lim/limProcessTdls.c
+++ b/CORE/MAC/src/pe/lim/limProcessTdls.c
@@ -858,7 +858,8 @@
/* populate supported rate and ext supported rate IE */
if (eSIR_FAILURE == PopulateDot11fRatesTdls(pMac, &tdlsDisRsp.SuppRates,
- &tdlsDisRsp.ExtSuppRates))
+ &tdlsDisRsp.ExtSuppRates,
+ psessionEntry->currentOperChannel))
limLog(pMac, LOGE, FL("could not populate supported data rates"));
/* Populate extended capability IE */
@@ -1124,9 +1125,14 @@
swapBitField16(caps, ( tANI_U16* )&tdlsSetupReq.Capabilities );
+ limLog(pMac, LOG1, FL("Sending operating channel %d and dotl11mode %d\n"),
+ psessionEntry->currentOperChannel,
+ psessionEntry->dot11mode);
+
/* populate supported rate and ext supported rate IE */
PopulateDot11fRatesTdls(pMac, &tdlsSetupReq.SuppRates,
- &tdlsSetupReq.ExtSuppRates);
+ &tdlsSetupReq.ExtSuppRates,
+ psessionEntry->currentOperChannel);
/* Populate extended capability IE */
PopulateDot11fTdlsExtCapability( pMac, &tdlsSetupReq.ExtCap );
@@ -1604,7 +1610,8 @@
/* populate supported rate and ext supported rate IE */
PopulateDot11fRatesTdls(pMac, &tdlsSetupRsp.SuppRates,
- &tdlsSetupRsp.ExtSuppRates);
+ &tdlsSetupRsp.ExtSuppRates,
+ psessionEntry->currentOperChannel);
/* Populate extended capability IE */
PopulateDot11fTdlsExtCapability( pMac, &tdlsSetupRsp.ExtCap );
diff --git a/CORE/SYS/legacy/src/utils/src/parserApi.c b/CORE/SYS/legacy/src/utils/src/parserApi.c
index 72b2d1c..784bd3a 100644
--- a/CORE/SYS/legacy/src/utils/src/parserApi.c
+++ b/CORE/SYS/legacy/src/utils/src/parserApi.c
@@ -1587,7 +1587,8 @@
tSirRetStatus
PopulateDot11fRatesTdls(tpAniSirGlobal p_mac,
tDot11fIESuppRates *p_supp_rates,
- tDot11fIEExtSuppRates *p_ext_supp_rates)
+ tDot11fIEExtSuppRates *p_ext_supp_rates,
+ tANI_U8 curr_oper_channel)
{
tSirMacRateSet temp_rateset;
tSirMacRateSet temp_rateset2;
@@ -1597,15 +1598,22 @@
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
+ * Include 11b rates only when the device configured
+ * in auto, 11a/b/g or 11b_only and also if current base
+ * channel is 5 GHz then no need to advertise the 11b rates.
+ * If devices to move 2.4GHz off-channel then they can communicate
+ * in 11g rates i.e. (6, 9, 12, 18, 24, 36 and 54).
*/
- if ((self_dot11mode == WNI_CFG_DOT11_MODE_ALL) ||
+ limLog(p_mac, LOG1, FL("Current operating channel %d self_dot11mode = %d"),
+ curr_oper_channel, self_dot11mode);
+
+ if ((curr_oper_channel <= SIR_11B_CHANNEL_END) &&
+ ((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) )
+ (self_dot11mode == WNI_CFG_DOT11_MODE_11B)))
{
val = WNI_CFG_SUPPORTED_RATES_11B_LEN;
wlan_cfgGetStr(p_mac, WNI_CFG_SUPPORTED_RATES_11B,