Bläddra i källkod

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
Deepthi Gowri 8 år sedan
förälder
incheckning
ccfd918e7b
1 ändrade filer med 6 tillägg och 10 borttagningar
  1. 6 10
      core/mac/src/sys/legacy/src/utils/src/parser_api.c

+ 6 - 10
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));
 	}