wlan: Fix for passing multicast traffic over IBSS
The packets were going out with broadcast address since TL was not
using the destination address from the incoming packet. Also the
packet was being sent out on DPU descriptor which is configured
for sending unicast traffic causing the packet to retransmit. The
multicast packets don't have ACKs, hence there was MAC retransmit
Change-Id: I1e80f97a25595d6d576b21c462b02c2ae3d7388d
CRs-Fixed: 509454
diff --git a/CORE/MAC/src/pe/lim/limTimerUtils.c b/CORE/MAC/src/pe/lim/limTimerUtils.c
index 123a362..866eae6 100644
--- a/CORE/MAC/src/pe/lim/limTimerUtils.c
+++ b/CORE/MAC/src/pe/lim/limTimerUtils.c
@@ -1821,47 +1821,48 @@
void
limHeartBeatDeactivateAndChangeTimer(tpAniSirGlobal pMac, tpPESession psessionEntry)
{
- tANI_U32 val, val1;
+ tANI_U32 val, val1;
- MTRACE(macTrace(pMac, TRACE_CODE_TIMER_DEACTIVATE, psessionEntry->peSessionId, eLIM_HEART_BEAT_TIMER));
+ MTRACE(macTrace(pMac, TRACE_CODE_TIMER_DEACTIVATE, psessionEntry->peSessionId, eLIM_HEART_BEAT_TIMER));
#ifdef WLAN_ACTIVEMODE_OFFLOAD_FEATURE
- if(IS_ACTIVEMODE_OFFLOAD_FEATURE_ENABLE)
- return;
+ if(IS_ACTIVEMODE_OFFLOAD_FEATURE_ENABLE)
+ return;
#endif
- if (tx_timer_deactivate(&pMac->lim.limTimers.gLimHeartBeatTimer) != TX_SUCCESS)
- limLog(pMac, LOGP, FL("Fail to deactivate HeartBeatTimer "));
+ if (tx_timer_deactivate(&pMac->lim.limTimers.gLimHeartBeatTimer) != TX_SUCCESS)
+ limLog(pMac, LOGP, FL("Fail to deactivate HeartBeatTimer "));
- /* HB Timer sessionisation: In case of 2 or more sessions, the HB interval keeps
- changing. to avoid this problem, HeartBeat interval is made constant, by
- fixing beacon interval to 100ms immaterial of the beacon interval of the session */
+ /* HB Timer sessionisation: In case of 2 or more sessions, the HB interval keeps
+ changing. to avoid this problem, HeartBeat interval is made constant, by
+ fixing beacon interval to 100ms immaterial of the beacon interval of the session */
- //val = psessionEntry->beaconParams.beaconInterval;
- val = LIM_HB_TIMER_BEACON_INTERVAL;
+ //val = psessionEntry->beaconParams.beaconInterval;
+ val = LIM_HB_TIMER_BEACON_INTERVAL;
- if (wlan_cfgGetInt(pMac, WNI_CFG_HEART_BEAT_THRESHOLD, &val1) != eSIR_SUCCESS)
- limLog(pMac, LOGP, FL("Fail to get WNI_CFG_HEART_BEAT_THRESHOLD "));
+ if (wlan_cfgGetInt(pMac, WNI_CFG_HEART_BEAT_THRESHOLD, &val1) != eSIR_SUCCESS)
+ limLog(pMac, LOGP, FL("Fail to get WNI_CFG_HEART_BEAT_THRESHOLD "));
- PELOGW(limLog(pMac,LOGW,
- FL("HB Timer Int.=100ms * %d, Beacon Int.=%dms,Session Id=%d "),
- val1, psessionEntry->beaconParams.beaconInterval,
- psessionEntry->peSessionId);)
+ PELOGW(limLog(pMac,LOGW,
+ FL("HB Timer Int.=100ms * %d, Beacon Int.=%dms,Session Id=%d "),
+ val1, psessionEntry->beaconParams.beaconInterval,
+ psessionEntry->peSessionId);)
- /* The HB timer timeout value of 4 seconds (40 beacon intervals) is not enough
- * to judge the peer device inactivity when 32 peers are connected. Hence
- * increasing the HB timer timeout to
- * HBtimeout = (TBTT * num_beacons * num_peers)
- */
- if (eSIR_IBSS_MODE == psessionEntry->bssType)
- {
+ /* The HB timer timeout value of 4 seconds (40 beacon intervals) is not
+ * enough to judge the peer device inactivity when 32 peers are connected.
+ * Hence increasing the HB timer timeout to
+ * HBtimeout = (TBTT * num_beacons * num_peers)
+ */
+ if (eSIR_IBSS_MODE == psessionEntry->bssType &&
+ pMac->lim.gLimNumIbssPeers > 0)
+ {
val1 = val1 * pMac->lim.gLimNumIbssPeers;
- }
+ }
- // Change timer to reactivate it in future
- val = SYS_MS_TO_TICKS(val * val1);
+ // Change timer to reactivate it in future
+ val = SYS_MS_TO_TICKS(val * val1);
- if (tx_timer_change(&pMac->lim.limTimers.gLimHeartBeatTimer, val, 0) != TX_SUCCESS)
- limLog(pMac, LOGP, FL("Fail to change HeartBeatTimer"));
+ if (tx_timer_change(&pMac->lim.limTimers.gLimHeartBeatTimer, val, 0) != TX_SUCCESS)
+ limLog(pMac, LOGP, FL("Fail to change HeartBeatTimer"));
} /****** end limHeartBeatDeactivateAndChangeTimer() ******/
diff --git a/CORE/TL/src/wlan_qct_tl.c b/CORE/TL/src/wlan_qct_tl.c
index a2fa4c0..428ea2d 100644
--- a/CORE/TL/src/wlan_qct_tl.c
+++ b/CORE/TL/src/wlan_qct_tl.c
@@ -2390,7 +2390,8 @@
{
vosStatus = WLANTL_Translate8023To80211Header( vosDataBuff, &vosStatus,
pTLCb, &ucStaId,
- pMetaInfo->ucUP, &ucWDSEnabled, &extraHeadSpace);
+ pMetaInfo, &ucWDSEnabled,
+ &extraHeadSpace);
if ( VOS_STATUS_SUCCESS != vosStatus )
{
@@ -6500,7 +6501,8 @@
{
vosStatus = WLANTL_Translate8023To80211Header( vosDataBuff, &vosStatus,
pTLCb, &ucSTAId,
- tlMetaInfo.ucUP, &ucWDSEnabled, &extraHeadSpace);
+ &tlMetaInfo, &ucWDSEnabled,
+ &extraHeadSpace);
if ( VOS_STATUS_SUCCESS != vosStatus )
{
TLLOGE(VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR,
@@ -6902,7 +6904,8 @@
vosStatus = WLANTL_Translate8023To80211Header( vosDataBuff, &vosStatus,
pTLCb, &ucSTAId,
- tlMetaInfo.ucUP, &ucWDSEnabled, &extraHeadSpace);
+ &tlMetaInfo, &ucWDSEnabled,
+ &extraHeadSpace);
if ( VOS_STATUS_SUCCESS != vosStatus )
{
TLLOGE(VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR,
@@ -8694,7 +8697,7 @@
VOS_STATUS* pvosStatus,
WLANTL_CbType* pTLCb,
v_U8_t *pucStaId,
- v_U8_t ucUP,
+ WLANTL_MetaInfoType *tlMetaInfo,
v_U8_t *ucWDSEnabled,
v_U8_t *extraHeadSpace
)
@@ -8879,7 +8882,7 @@
{
pw80211Header->wFrmCtrl.subType = WLANTL_80211_DATA_QOS_SUBTYPE;
- *((v_U16_t *)((v_U8_t *)ppvBDHeader + ucQoSOffset)) = ucUP;
+ *((v_U16_t *)((v_U8_t *)ppvBDHeader + ucQoSOffset)) = tlMetaInfo->ucUP;
}
else
@@ -8894,36 +8897,49 @@
switch( pClientSTA->wSTADesc.wSTAType )
{
- case WLAN_STA_IBSS:
+ case WLAN_STA_IBSS:
pw80211Header->wFrmCtrl.toDS = 0;
pw80211Header->wFrmCtrl.fromDS = 0;
- /*Fix me*/
- vos_copy_macaddr( (v_MACADDR_t*)&pw80211Header->vA1,
- &pClientSTA->wSTADesc.vSTAMACAddress);
+
+ /*
+ * If the frame is a multicast frame, then, the Address1
+ * should be the destination address filled in the packet. Which is
+ * the multicast address. Otherwise, set it to BSSID
+ */
+ if (0 == tlMetaInfo->ucBcast && 1 == tlMetaInfo->ucMcast)
+ {
+ vos_copy_macaddr( (v_MACADDR_t*)&pw80211Header->vA1,
+ (v_MACADDR_t*)&w8023Header.vDA);
+ }
+ else
+ {
+ vos_copy_macaddr( (v_MACADDR_t*)&pw80211Header->vA1,
+ &pClientSTA->wSTADesc.vSTAMACAddress);
+ }
vos_mem_copy( pw80211Header->vA3,
&pClientSTA->wSTADesc.vBSSIDforIBSS ,
VOS_MAC_ADDR_SIZE);
break;
- case WLAN_STA_BT_AMP:
+ case WLAN_STA_BT_AMP:
*ucWDSEnabled = 1; // WDS on.
pw80211Header->wFrmCtrl.toDS = 1;
pw80211Header->wFrmCtrl.fromDS = 1;
vos_copy_macaddr( (v_MACADDR_t*)&pw80211Header->vA1,
&pClientSTA->wSTADesc.vSTAMACAddress);
vos_mem_copy( pw80211Header->vA2,
- w8023Header.vSA, VOS_MAC_ADDR_SIZE);
+ w8023Header.vSA, VOS_MAC_ADDR_SIZE);
vos_copy_macaddr( (v_MACADDR_t*)&pw80211Header->vA3,
&pClientSTA->wSTADesc.vSTAMACAddress);
/* fill the optional A4 header */
vos_mem_copy( pw80211Header->optvA4,
- w8023Header.vSA, VOS_MAC_ADDR_SIZE);
+ w8023Header.vSA, VOS_MAC_ADDR_SIZE);
TLLOG2(VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_INFO_HIGH,
- "BTAMP CASE NOW ---------staid=%d\n",
- ucStaId));
+ "BTAMP CASE NOW ---------staid=%d\n",
+ ucStaId));
break;
- case WLAN_STA_SOFTAP:
+ case WLAN_STA_SOFTAP:
*ucWDSEnabled = 0; // WDS off.
pw80211Header->wFrmCtrl.toDS = 0;
pw80211Header->wFrmCtrl.fromDS = 1;
@@ -8932,13 +8948,13 @@
vos_copy_macaddr( (v_MACADDR_t*)&pw80211Header->vA2,
&pClientSTA->wSTADesc.vSelfMACAddress);
vos_mem_copy( pw80211Header->vA3,
- w8023Header.vSA, VOS_MAC_ADDR_SIZE);
+ w8023Header.vSA, VOS_MAC_ADDR_SIZE);
TLLOG2(VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_INFO_HIGH,
- "sw 802 to 80211 softap case ---------staid=%d\n",
- ucStaId));
+ "sw 802 to 80211 softap case ---------staid=%d\n",
+ ucStaId));
break;
#ifdef FEATURE_WLAN_TDLS
- case WLAN_STA_TDLS:
+ case WLAN_STA_TDLS:
pw80211Header->wFrmCtrl.toDS = 0;
pw80211Header->wFrmCtrl.fromDS = 0;
/*Fix me*/
@@ -8948,19 +8964,19 @@
&pClientSTA->wSTADesc.vBSSIDforIBSS ,
VOS_MAC_ADDR_SIZE);
VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_INFO_HIGH,
- ("TL:TDLS CASE NOW ---------staid=%d\n"), ucStaId);
+ ("TL:TDLS CASE NOW ---------staid=%d\n"), ucStaId);
break;
#endif
- case WLAN_STA_INFRA:
- default:
+ case WLAN_STA_INFRA:
+ default:
pw80211Header->wFrmCtrl.toDS = 1;
pw80211Header->wFrmCtrl.fromDS = 0;
vos_copy_macaddr( (v_MACADDR_t*)&pw80211Header->vA1,
&pClientSTA->wSTADesc.vSTAMACAddress);
vos_mem_copy( pw80211Header->vA3, w8023Header.vDA , VOS_MAC_ADDR_SIZE);
TLLOG2(VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_INFO_HIGH,
- "REGULAR INFRA LINK CASE---------staid=%d\n",
- ucStaId));
+ "REGULAR INFRA LINK CASE---------staid=%d\n",
+ ucStaId));
break;
}
// OK now we have the space. Fill the 80211 header
diff --git a/CORE/TL/src/wlan_qct_tli.h b/CORE/TL/src/wlan_qct_tli.h
index e6cd5b1..35e575b 100644
--- a/CORE/TL/src/wlan_qct_tli.h
+++ b/CORE/TL/src/wlan_qct_tli.h
@@ -1284,7 +1284,7 @@
VOS_STATUS* pvosStatus,
WLANTL_CbType* pTLCb,
v_U8_t *pucStaId,
- v_U8_t ucUP,
+ WLANTL_MetaInfoType* pTlMetaInfo,
v_U8_t *ucWDSEnabled,
v_U8_t *extraHeadSpace
);
diff --git a/CORE/WDI/CP/src/wlan_qct_wdi.c b/CORE/WDI/CP/src/wlan_qct_wdi.c
index f02c840..346506f 100644
--- a/CORE/WDI/CP/src/wlan_qct_wdi.c
+++ b/CORE/WDI/CP/src/wlan_qct_wdi.c
@@ -15297,7 +15297,7 @@
Add Broadcast STA only in AP mode
-------------------------------------------------------------------------*/
if( pWDICtx->wdiCachedConfigBssReq.wdiReqInfo.ucOperMode ==
- WDI_BSS_OPERATIONAL_MODE_AP )
+ WDI_BSS_OPERATIONAL_MODE_AP || pBSSSes->wdiBssType == WDI_IBSS_MODE)
{
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_INFO,
"Add BCAST STA to table for index: %d",