Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0a75a48 authored by Madan Mohan Koyyalamudi's avatar Madan Mohan Koyyalamudi
Browse files

wlan : wmm : Switch from UAPSD to legacy power save with DelTS 

With the existing support, STA does not switch back from UAPSD to
legacy power when AP sends DelTSpec for a tid. And Exit UAPSD
doesnot happen when processing the DelTspec received from AP.
Changes made in address these issues.

Change-Id: I7975dbf72e4097aef9d3648af82959ab70f3f278
CRs-fixed: 550442
parent 96797446

CORE/MAC/src/pe/include/limAdmitControl.h

+6 −1
Original line number Diff line number Diff line
@@ -112,7 +112,12 @@ limUpdateAdmitPolicy( 
tSirRetStatus limAdmitControlInit(tpAniSirGlobal pMac);



tSirRetStatus limSendHalMsgAddTs(tpAniSirGlobal pMac, tANI_U16 staIdx, tANI_U8 tspecIdx, tSirMacTspecIE tspecIE, tANI_U8 sessionId);

tSirRetStatus limSendHalMsgDelTs(tpAniSirGlobal pMac,  tANI_U16 staIdx,  tANI_U8 tspecIdx,  tSirDeltsReqInfo delts, tANI_U8 sessionId);

tSirRetStatus limSendHalMsgDelTs(tpAniSirGlobal pMac,

                                 tANI_U16 staIdx,

                                 tANI_U8 tspecIdx,

                                 tSirDeltsReqInfo delts,

                                 tANI_U8 sessionId,

                                 tANI_U8 *bssId);

void limProcessHalAddTsRsp(tpAniSirGlobal pMac, tpSirMsgQ limMsg);



#endif

CORE/MAC/src/pe/lim/limAdmitControl.c

+3 −1
Original line number Diff line number Diff line
@@ -1149,7 +1149,8 @@ limSendHalMsgDelTs( 
  tANI_U16       staIdx,

  tANI_U8         tspecIdx,

  tSirDeltsReqInfo delts,

  tANI_U8        sessionId)

  tANI_U8        sessionId,

  tANI_U8        *bssId)

{

  tSirMsgQ msg;

  tpDelTsParams pDelTsParam;
@@ -1169,6 +1170,7 @@ limSendHalMsgDelTs( 
  //filling message parameters.

  pDelTsParam->staIdx = staIdx;

  pDelTsParam->tspecIdx = tspecIdx;

  vos_mem_copy(&pDelTsParam->bssId, bssId, sizeof(tSirMacAddr));



  PELOGW(limLog(pMac, LOGW, FL("calling wdaPostCtrlMsg()"));)

  MTRACE(macTraceMsgTx(pMac, sessionId, msg.type));

CORE/MAC/src/pe/lim/limProcessActionFrame.c

+11 −4
Original line number Diff line number Diff line
@@ -757,7 +757,7 @@ __limProcessDelTsReq(tpAniSirGlobal pMac, tANI_U8 *pRxPacketInfo,tpPESession pse 
    if ((tsinfo->traffic.accessPolicy == SIR_MAC_ACCESSPOLICY_EDCA))

    {

    

        if ((upToAc(tsinfo->traffic.userPrio) >= MAX_NUM_AC) || (! psessionEntry->gLimEdcaParams[upToAc(tsinfo->traffic.userPrio)].aci.acm))

        if (upToAc(tsinfo->traffic.userPrio) >= MAX_NUM_AC)

        {

            limLog(pMac, LOGW, FL("DelTs with UP %d has no AC - ignoring request"),

                   tsinfo->traffic.userPrio);
@@ -765,6 +765,10 @@ __limProcessDelTsReq(tpAniSirGlobal pMac, tANI_U8 *pRxPacketInfo,tpPESession pse 
        }

    }



    if ((psessionEntry->limSystemRole != eLIM_AP_ROLE) &&

        (psessionEntry->limSystemRole != eLIM_BT_AMP_AP_ROLE))

        limSendSmeDeltsInd(pMac, &delts, aid,psessionEntry);



    // try to delete the TS

    if (eSIR_SUCCESS != limAdmitControlDeleteTS(pMac, pSta->assocId, tsinfo, &tsStatus, &tspecIdx))

    {
@@ -780,7 +784,12 @@ __limProcessDelTsReq(tpAniSirGlobal pMac, tANI_U8 *pRxPacketInfo,tpPESession pse 
    else

    {

      //send message to HAL to delete TS

      if(eSIR_SUCCESS != limSendHalMsgDelTs(pMac, pSta->staIndex, tspecIdx, delts, psessionEntry->peSessionId))

      if(eSIR_SUCCESS != limSendHalMsgDelTs(pMac,

                                            pSta->staIndex,

                                            tspecIdx,

                                            delts,

                                            psessionEntry->peSessionId,

                                            psessionEntry->bssId))

      {

        limLog(pMac, LOGW, FL("DelTs with UP %d failed in limSendHalMsgDelTs - ignoring request"),

                         tsinfo->traffic.userPrio);
@@ -840,8 +849,6 @@ __limProcessDelTsReq(tpAniSirGlobal pMac, tANI_U8 *pRxPacketInfo,tpPESession pse 
        limLog(pMac, LOGE, FL("Self entry missing in Hash Table "));



    PELOG1(limLog(pMac, LOG1, FL("DeleteTS succeeded"));)

    if((psessionEntry->limSystemRole != eLIM_AP_ROLE)&&(psessionEntry->limSystemRole != eLIM_BT_AMP_AP_ROLE))

      limSendSmeDeltsInd(pMac, &delts, aid,psessionEntry);



#ifdef FEATURE_WLAN_CCX

    limDeactivateAndChangeTimer(pMac,eLIM_TSM_TIMER);

CORE/MAC/src/pe/lim/limUtils.c

+6 −1
Original line number Diff line number Diff line
@@ -5468,7 +5468,12 @@ limValidateDeltsReq(tpAniSirGlobal pMac, tpSirDeltsReq pDeltsReq, tSirMacAddr pe 
           psessionEntry->gLimEdcaParams[upToAc(tsinfo->traffic.userPrio)].aci.acm)

      {

        //send message to HAL to delete TS

        if(eSIR_SUCCESS != limSendHalMsgDelTs(pMac, pSta->staIndex, tspecIdx, pDeltsReq->req, psessionEntry->peSessionId))

        if(eSIR_SUCCESS != limSendHalMsgDelTs(pMac,

                                              pSta->staIndex,

                                              tspecIdx,

                                              pDeltsReq->req,

                                              psessionEntry->peSessionId,

                                              psessionEntry->bssId))

        {

          limLog(pMac, LOGW, FL("DelTs with UP %d failed in limSendHalMsgDelTs - ignoring request"),

                           tsinfo->traffic.userPrio);

CORE/MAC/src/pe/pmm/pmmApi.c

+3 −3
Original line number Diff line number Diff line
@@ -2583,19 +2583,19 @@ tSirRetStatus pmmUapsdSendChangePwrSaveMsg (tpAniSirGlobal pMac, tANI_U8 mode) 
        pUapsdParams->voTriggerEnabled = LIM_UAPSD_GET(ACVO, uapsdTriggerMask);

        pUapsdParams->bssIdx = pSessionEntry->bssIdx;



        PELOGE(pmmLog(pMac, LOGE, 

        PELOGW(pmmLog(pMac, LOGW,

                      FL("UAPSD Mask:  static = 0x%x, DeliveryEnabled = 0x%x, TriggerEnabled = 0x%x "),

            pMac->lim.gUapsdPerAcBitmask,

            pMac->lim.gUapsdPerAcDeliveryEnableMask,

            pMac->lim.gUapsdPerAcTriggerEnableMask);)



        PELOG1(pmmLog(pMac, LOG1, FL("Delivery Enabled: BK=%d, BE=%d, Vi=%d, Vo=%d "),

        PELOGW(pmmLog(pMac, LOGW, FL("Delivery Enabled: BK=%d, BE=%d, Vi=%d, Vo=%d "),

            pUapsdParams->bkDeliveryEnabled, 

            pUapsdParams->beDeliveryEnabled, 

            pUapsdParams->viDeliveryEnabled, 

            pUapsdParams->voDeliveryEnabled);)



        PELOG1(pmmLog(pMac, LOG1, FL("Trigger Enabled: BK=%d, BE=%d, Vi=%d, Vo=%d "),

        PELOGW(pmmLog(pMac, LOGW, FL("Trigger Enabled: BK=%d, BE=%d, Vi=%d, Vo=%d "),

            pUapsdParams->bkTriggerEnabled, 

            pUapsdParams->beTriggerEnabled, 

            pUapsdParams->viTriggerEnabled,