Prechádzať zdrojové kódy

qcacld-3.0: Fix csr_is_ssid_equal() context param

Currently csr_is_ssid_equal() 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: I3db1f07166f90de28c8ac8a6fb31480578b04caa
CRs-Fixed: 2255547
Jeff Johnson 6 rokov pred
rodič
commit
515b3ec473
2 zmenil súbory, kde vykonal 9 pridanie a 6 odobranie
  1. 5 3
      core/sme/inc/csr_support.h
  2. 4 3
      core/sme/src/csr/csr_util.c

+ 5 - 3
core/sme/inc/csr_support.h

@@ -254,9 +254,11 @@ uint8_t csr_retrieve_wpa_ie(tpAniSirGlobal pMac,
 			    tSirBssDescription *pSirBssDesc,
 			    tDot11fBeaconIEs *pIes, tCsrWpaIe *pWpaIe);
 
-bool csr_is_ssid_equal(tHalHandle hHal, tSirBssDescription *pSirBssDesc1,
-		tSirBssDescription *pSirBssDesc2,
-		tDot11fBeaconIEs *pIes2);
+bool csr_is_ssid_equal(tpAniSirGlobal pMac,
+		       tSirBssDescription *pSirBssDesc1,
+		       tSirBssDescription *pSirBssDesc2,
+		       tDot11fBeaconIEs *pIes2);
+
 /* Null ssid means match */
 bool csr_is_ssid_in_list(tSirMacSSid *pSsid, tCsrSSIDs *pSsidList);
 bool csr_is_profile_wpa(struct csr_roam_profile *pProfile);

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

@@ -1488,12 +1488,13 @@ bool csr_is_wmm_supported(tpAniSirGlobal pMac)
 }
 
 /* pIes is the IEs for pSirBssDesc2 */
-bool csr_is_ssid_equal(tHalHandle hHal, tSirBssDescription *pSirBssDesc1,
-		      tSirBssDescription *pSirBssDesc2, tDot11fBeaconIEs *pIes2)
+bool csr_is_ssid_equal(tpAniSirGlobal pMac,
+		       tSirBssDescription *pSirBssDesc1,
+		       tSirBssDescription *pSirBssDesc2,
+		       tDot11fBeaconIEs *pIes2)
 {
 	bool fEqual = false;
 	tSirMacSSid Ssid1, Ssid2;
-	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 	tDot11fBeaconIEs *pIes1 = NULL;
 	tDot11fBeaconIEs *pIesLocal = pIes2;