浏览代码

qcacld-3.0: Fix csr_construct_rsn_ie() context param

Currently csr_construct_rsn_ie() takes a tHalHandle context param.
However CSR is an internal module, and hence it should be using the
"real" context pointer type tpAniSirGlobal instead of the opaque
reference tHalhandle, so update the API.

Change-Id: I812709f7c149788d04151ac0b2bf2d79527131b4
CRs-Fixed: 2255547
Jeff Johnson 6 年之前
父节点
当前提交
079c002f0f
共有 2 个文件被更改,包括 6 次插入7 次删除
  1. 4 4
      core/sme/inc/csr_support.h
  2. 2 3
      core/sme/src/csr/csr_util.c

+ 4 - 4
core/sme/inc/csr_support.h

@@ -231,10 +231,10 @@ uint32_t csr_get_rts_thresh(tpAniSirGlobal mac_ctx);
 eCsrPhyMode csr_get_phy_mode_from_bssDesc(tSirBssDescription *pSirBssDesc);
 uint32_t csr_get11h_power_constraint(tpAniSirGlobal mac_ctx,
 				     tDot11fIEPowerConstraints *constraints);
-uint8_t csr_construct_rsn_ie(tHalHandle hHal, uint32_t sessionId,
-		struct csr_roam_profile *pProfile,
-		tSirBssDescription *pSirBssDesc,
-		tDot11fBeaconIEs *pIes, tCsrRSNIe *pRSNIe);
+uint8_t csr_construct_rsn_ie(tpAniSirGlobal pMac, uint32_t sessionId,
+			     struct csr_roam_profile *pProfile,
+			     tSirBssDescription *pSirBssDesc,
+			     tDot11fBeaconIEs *pIes, tCsrRSNIe *pRSNIe);
 
 uint8_t csr_construct_wpa_ie(tHalHandle hHal, struct csr_roam_profile *pProfile,
 			     tSirBssDescription *pSirBssDesc,

+ 2 - 3
core/sme/src/csr/csr_util.c

@@ -3888,13 +3888,12 @@ static inline void csr_update_pmksa_to_profile(struct csr_roam_profile *profile,
 }
 #endif
 
-uint8_t csr_construct_rsn_ie(tHalHandle hHal, uint32_t sessionId,
+uint8_t csr_construct_rsn_ie(tpAniSirGlobal pMac, uint32_t sessionId,
 			     struct csr_roam_profile *pProfile,
 			     tSirBssDescription *pSirBssDesc,
 			     tDot11fBeaconIEs *pIes, tCsrRSNIe *pRSNIe)
 {
 	uint32_t ret;
-	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 	bool fRSNMatch;
 	uint8_t cbRSNIe = 0;
 	uint8_t UnicastCypher[CSR_RSN_OUI_SIZE];
@@ -3950,7 +3949,7 @@ uint8_t csr_construct_rsn_ie(tHalHandle hHal, uint32_t sessionId,
 		/* See if the cyphers in the Bss description match with the
 		 * settings in the profile.
 		 */
-		fRSNMatch = csr_get_rsn_information(hHal, &pProfile->AuthType,
+		fRSNMatch = csr_get_rsn_information(pMac, &pProfile->AuthType,
 					pProfile->negotiatedUCEncryptionType,
 					&pProfile->mcEncryptionType,
 					&pIesLocal->RSN, UnicastCypher,