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

Commit 4cde829a authored by Abhinav Kumar's avatar Abhinav Kumar Committed by Gerrit - the friendly Code Review server
Browse files

wlan: Always send assoc req/rsp 

propagation from qcacld-3.0 to pronto

Currently driver sends rsn ie request and response as part
of connect results update. Instead, send assoc request and
assoc response always which will anyways have rsn ie request
and response. Supplicant needs assoc response to proceed
for OWE based connection

Change-Id: I7f022248a6ad2ad835826c94ccdfaccd5d6090bc
CRs-Fixed: 2531104
parent b72f8ce3

CORE/HDD/src/wlan_hdd_assoc.c

+53 −49
Original line number Diff line number Diff line
@@ -2479,13 +2479,10 @@ static eHalStatus hdd_AssociationCompletionHandler( hdd_adapter_t *pAdapter, tCs 
                }

                return eHAL_STATUS_FAILURE;

            }

#ifdef WLAN_FEATURE_VOWIFI_11R

            if(pRoamInfo->u.pConnectedProfile->AuthType == eCSR_AUTH_TYPE_FT_RSN ||

                pRoamInfo->u.pConnectedProfile->AuthType == eCSR_AUTH_TYPE_FT_RSN_PSK )

            {



            //Association Response

                pFTAssocRsp = (u8 *)(pRoamInfo->pbFrames + pRoamInfo->nBeaconLength +

            pFTAssocRsp = (u8 *)(pRoamInfo->pbFrames +

                                 pRoamInfo->nBeaconLength +

                                 pRoamInfo->nAssocReqLength);

            if (pFTAssocRsp != NULL)

            {
@@ -2494,7 +2491,8 @@ static eHalStatus hdd_AssociationCompletionHandler( hdd_adapter_t *pAdapter, tCs 
                hddLog(LOG1, "%s: AssocRsp is now at %02x%02x", __func__,

                       (unsigned int)pFTAssocRsp[0],

                       (unsigned int)pFTAssocRsp[1]);

                    assocRsplen = pRoamInfo->nAssocRspLength - FT_ASSOC_RSP_IES_OFFSET;

                assocRsplen =

                         pRoamInfo->nAssocRspLength - FT_ASSOC_RSP_IES_OFFSET;

            }

            else

            {
@@ -2514,7 +2512,8 @@ static eHalStatus hdd_AssociationCompletionHandler( hdd_adapter_t *pAdapter, tCs 
                    hddLog(LOG1, "%s: pFTAssocReq is now at %02x%02x", __func__,

                           (unsigned int)pFTAssocReq[0],

                           (unsigned int)pFTAssocReq[1]);

                        assocReqlen = pRoamInfo->nAssocReqLength - FT_ASSOC_REQ_IES_OFFSET;

                     assocReqlen =

                          pRoamInfo->nAssocReqLength - FT_ASSOC_REQ_IES_OFFSET;

                 }

                 else

                 {
@@ -2528,6 +2527,13 @@ static eHalStatus hdd_AssociationCompletionHandler( hdd_adapter_t *pAdapter, tCs 
                assocReqlen = 0;

            }



            hddLog(LOG1, "assocReqlen %d assocRsplen %d", assocReqlen,

                   assocRsplen);



#ifdef WLAN_FEATURE_VOWIFI_11R

            if(pRoamInfo->u.pConnectedProfile->AuthType == eCSR_AUTH_TYPE_FT_RSN ||

                pRoamInfo->u.pConnectedProfile->AuthType == eCSR_AUTH_TYPE_FT_RSN_PSK )

            {

                if(ft_carrier_on)

                {

                    if ( !hddDisconInProgress )
@@ -2538,8 +2544,6 @@ static eHalStatus hdd_AssociationCompletionHandler( hdd_adapter_t *pAdapter, tCs 
                                 "indication", __FUNCTION__, ft_carrier_on);

                        chan = ieee80211_get_channel(pAdapter->wdev.wiphy,

                                         (int)pRoamInfo->pBssDesc->channelId);

                        hddLog(LOG1, "assocReqlen %d assocRsplen %d", assocReqlen,

                                         assocRsplen);

                        if (pHddCtx->cfg_ini &&

                            pHddCtx->cfg_ini->gEnableRoamDelayStats)

                        {
@@ -2618,8 +2622,8 @@ static eHalStatus hdd_AssociationCompletionHandler( hdd_adapter_t *pAdapter, tCs 
                         /* inform connect result to nl80211 */

                         hdd_connect_result(dev, pRoamInfo->bssid,

                                pRoamInfo,

                                reqRsnIe, reqRsnLength,

                                rspRsnIe, rspRsnLength,

                                pFTAssocReq, assocReqlen,

                                pFTAssocRsp, assocRsplen,

                                WLAN_STATUS_SUCCESS,

                                GFP_KERNEL);

                    }

CORE/MAC/inc/qwlan_version.h

+1 −1
Original line number Diff line number Diff line
@@ -46,6 +46,6 @@ BRIEF DESCRIPTION: 


#define QWLAN_VERSION_BUILD            85



#define QWLAN_VERSIONSTR               "3.0.11.85"

#define QWLAN_VERSIONSTR               "3.0.11.85.9"



#endif /* QWLAN_VERSION_H */