From ccfd918e7b48a952ec336b22fab2f2c5a3a4e4d5 Mon Sep 17 00:00:00 2001 From: Deepthi Gowri Date: Wed, 12 Oct 2016 16:00:49 +0530 Subject: qcacld-3.0: Set the Extcap present flag if Ext-caps element is present qcacld-2.0 to qcacld-3.0 propagation Currently the Extcap present flag is not set even if the extended capabilities are present in the assoc response, assoc req or reassoc req frames. To address this, set the extcap present flag in assoc response, assoc request or reassoc req Extcab structure. CRs-Fixed: 1073033 Change-Id: I84ffb04105af0c84d33e524814795dd30a5d62a5 --- core/mac/src/sys/legacy/src/utils/src/parser_api.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/core/mac/src/sys/legacy/src/utils/src/parser_api.c b/core/mac/src/sys/legacy/src/utils/src/parser_api.c index 4cfb1fff3c6f..eea1199143ba 100644 --- a/core/mac/src/sys/legacy/src/utils/src/parser_api.c +++ b/core/mac/src/sys/legacy/src/utils/src/parser_api.c @@ -2789,9 +2789,8 @@ sir_convert_assoc_req_frame2_struct(tpAniSirGlobal pMac, } if (ar->ExtCap.present) { struct s_ext_cap *ext_cap; - qdf_mem_copy(&pAssocReq->ExtCap.bytes, &ar->ExtCap.bytes, - ar->ExtCap.num_bytes); - + qdf_mem_copy(&pAssocReq->ExtCap, &ar->ExtCap, + sizeof(tDot11fIEExtCap)); ext_cap = (struct s_ext_cap *)&pAssocReq->ExtCap.bytes; lim_log(pMac, LOG1, FL("timingMeas: %d, finetimingMeas Init: %d, Resp: %d"), @@ -2995,9 +2994,8 @@ sir_convert_assoc_resp_frame2_struct(tpAniSirGlobal pMac, if (ar.ExtCap.present) { struct s_ext_cap *ext_cap; - qdf_mem_copy(&pAssocRsp->ExtCap.bytes, &ar.ExtCap.bytes, - ar.ExtCap.num_bytes); - + qdf_mem_copy(&pAssocRsp->ExtCap, &ar.ExtCap, + sizeof(tDot11fIEExtCap)); ext_cap = (struct s_ext_cap *)&pAssocRsp->ExtCap.bytes; lim_log(pMac, LOG1, FL("timingMeas: %d, finetimingMeas Init: %d, Resp: %d"), @@ -3207,9 +3205,8 @@ sir_convert_reassoc_req_frame2_struct(tpAniSirGlobal pMac, } if (ar.ExtCap.present) { struct s_ext_cap *ext_cap; - qdf_mem_copy(&pAssocReq->ExtCap.bytes, &ar.ExtCap.bytes, - ar.ExtCap.num_bytes); - + qdf_mem_copy(&pAssocReq->ExtCap, &ar.ExtCap, + sizeof(tDot11fIEExtCap)); ext_cap = (struct s_ext_cap *)&pAssocReq->ExtCap.bytes; lim_log(pMac, LOG1, FL("timingMeas: %d, finetimingMeas Init: %d, Resp: %d"), @@ -3769,7 +3766,6 @@ sir_parse_beacon_ie(tpAniSirGlobal pMac, sizeof(tDot11fIEVHTOperation)); } if (pBies->ExtCap.present) { - pBeaconStruct->ext_cap.present = 1; qdf_mem_copy(&pBeaconStruct->ext_cap, &pBies->ExtCap, sizeof(tDot11fIEExtCap)); } -- cgit v1.2.3