Browse Source

qcacld-3.0: Fix uninitialized parameters

Remove unused parameter "pmkid_index" in
csr_lookup_pmkid_using_bssid().

Change-Id: Ieb8d0c8225fce65e25d6e3d97b5d0bd05d1a7154
CRs-Fixed: 2668234
Abhinav Kumar 5 years ago
parent
commit
23671b27af
3 changed files with 10 additions and 17 deletions
  1. 6 10
      core/sme/src/csr/csr_api_roam.c
  2. 1 3
      core/sme/src/csr/csr_inside_api.h
  3. 3 4
      core/sme/src/csr/csr_util.c

+ 6 - 10
core/sme/src/csr/csr_api_roam.c

@@ -15337,7 +15337,6 @@ static void csr_update_sae_config(struct join_req *csr_join_req,
 	struct mac_context *mac, struct csr_roam_session *session)
 {
 	tPmkidCacheInfo *pmkid_cache;
-	uint32_t index;
 
 	pmkid_cache = qdf_mem_malloc(sizeof(*pmkid_cache));
 	if (!pmkid_cache)
@@ -15348,7 +15347,7 @@ static void csr_update_sae_config(struct join_req *csr_join_req,
 		     QDF_MAC_ADDR_SIZE);
 
 	csr_join_req->sae_pmk_cached =
-	       csr_lookup_pmkid_using_bssid(mac, session, pmkid_cache, &index);
+	       csr_lookup_pmkid_using_bssid(mac, session, pmkid_cache);
 
 	qdf_mem_free(pmkid_cache);
 
@@ -21476,7 +21475,7 @@ csr_check_and_set_sae_single_pmk_cap(struct mac_context *mac_ctx,
 	struct wlan_objmgr_vdev *vdev;
 	struct mlme_pmk_info *pmk_info;
 	tPmkidCacheInfo *pmkid_cache;
-	uint32_t keymgmt, pmkid_index;
+	uint32_t keymgmt;
 	bool val, lookup_success;
 
 	vdev = wlan_objmgr_get_vdev_by_id_from_psoc(mac_ctx->psoc, vdev_id,
@@ -21513,8 +21512,7 @@ csr_check_and_set_sae_single_pmk_cap(struct mac_context *mac_ctx,
 		 * single pmk entries.
 		 */
 		lookup_success = csr_lookup_pmkid_using_bssid(mac_ctx, session,
-							      pmkid_cache,
-							      &pmkid_index);
+							      pmkid_cache);
 		qdf_mem_free(pmkid_cache);
 		if (lookup_success) {
 			wlan_crypto_selective_clear_sae_single_pmk_entries(vdev,
@@ -21560,7 +21558,6 @@ static QDF_STATUS csr_process_roam_sync_callback(struct mac_context *mac_ctx,
 	struct bss_params *add_bss_params;
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 	tPmkidCacheInfo *pmkid_cache;
-	uint32_t pmkid_index;
 	uint16_t len;
 #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH
 	struct ht_profile *src_profile = NULL;
@@ -21814,16 +21811,15 @@ static QDF_STATUS csr_process_roam_sync_callback(struct mac_context *mac_ctx,
 		sme_debug("Trying to find PMKID for " QDF_MAC_ADDR_STR,
 			  QDF_MAC_ADDR_ARRAY(pmkid_cache->BSSID.bytes));
 		if (csr_lookup_pmkid_using_bssid(mac_ctx, session,
-						 pmkid_cache,
-						 &pmkid_index)) {
+						 pmkid_cache)) {
 			session->pmk_len = pmkid_cache->pmk_len;
 			qdf_mem_zero(session->psk_pmk,
 				     sizeof(session->psk_pmk));
 			qdf_mem_copy(session->psk_pmk, pmkid_cache->pmk,
 				     session->pmk_len);
-			sme_debug("pmkid found for " QDF_MAC_ADDR_STR " at %d len %d",
+			sme_debug("pmkid found for " QDF_MAC_ADDR_STR " len %d",
 				  QDF_MAC_ADDR_ARRAY(pmkid_cache->BSSID.bytes),
-				  pmkid_index, (uint32_t)session->pmk_len);
+				  (uint32_t)session->pmk_len);
 		} else {
 			sme_debug("PMKID Not found in cache for " QDF_MAC_ADDR_STR,
 				  QDF_MAC_ADDR_ARRAY(pmkid_cache->BSSID.bytes));

+ 1 - 3
core/sme/src/csr/csr_inside_api.h

@@ -1046,14 +1046,12 @@ enum band_info csr_get_rf_band(uint8_t channel);
  * @mac: pointer to mac
  * @session: sme session pointer
  * @pmk_cache: pointer to pmk cache
- * @index: index value needs to be seached
  *
  * Return: true if pmkid is found else false
  */
 bool csr_lookup_pmkid_using_bssid(struct mac_context *mac,
 					struct csr_roam_session *session,
-					tPmkidCacheInfo *pmk_cache,
-					uint32_t *index);
+					tPmkidCacheInfo *pmk_cache);
 
 /**
  * csr_is_pmkid_found_for_peer() - check if pmkid sent by peer is present

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

@@ -2695,7 +2695,7 @@ bool csr_is_pmkid_found_for_peer(struct mac_context *mac,
 				 uint8_t *pmkid,
 				 uint16_t pmkid_count)
 {
-	uint32_t i, index;
+	uint32_t i;
 	uint8_t *session_pmkid;
 	tPmkidCacheInfo *pmkid_cache;
 
@@ -2706,7 +2706,7 @@ bool csr_is_pmkid_found_for_peer(struct mac_context *mac,
 	qdf_mem_copy(pmkid_cache->BSSID.bytes, peer_mac_addr,
 		     QDF_MAC_ADDR_SIZE);
 
-	if (!csr_lookup_pmkid_using_bssid(mac, session, pmkid_cache, &index)) {
+	if (!csr_lookup_pmkid_using_bssid(mac, session, pmkid_cache)) {
 		qdf_mem_free(pmkid_cache);
 		return false;
 	}
@@ -2728,8 +2728,7 @@ bool csr_is_pmkid_found_for_peer(struct mac_context *mac,
 
 bool csr_lookup_pmkid_using_bssid(struct mac_context *mac,
 				  struct csr_roam_session *session,
-				  tPmkidCacheInfo *pmk_cache,
-				  uint32_t *index)
+				  tPmkidCacheInfo *pmk_cache)
 {
 	struct wlan_crypto_pmksa *pmksa;
 	struct wlan_objmgr_vdev *vdev;