Browse Source

qcacld-3.0: Add logic to ignore PMF check for STA test mode

In testbed STA mode the RSNE may not match with APUT and thus
driver fails to filter AP from scan cache as PMF capability
mismatch.

With this change driver will ignore PMF capability check and
proceed with connection to send auth and assoc to APUT.

Change-Id: I1bf5947fb08574941eaf1845ec1e36ee9b030dd0
CRs-Fixed: 2195354
Abhishek Singh 7 years ago
parent
commit
6378103e12
2 changed files with 13 additions and 0 deletions
  1. 12 0
      core/hdd/src/wlan_hdd_assoc.c
  2. 1 0
      core/sme/src/csr/csr_api_scan.c

+ 12 - 0
core/hdd/src/wlan_hdd_assoc.c

@@ -5223,6 +5223,18 @@ int hdd_set_genie_to_csr(struct hdd_adapter *adapter,
 				   pWextState->roamProfile.nRSNReqIELength);
 
 		pWextState->roamProfile.force_rsne_override = true;
+
+		hdd_debug("MFPEnabled %d", pWextState->roamProfile.MFPEnabled);
+		/*
+		 * Reset MFPEnabled if testmode RSNE passed doesnt have MFPR
+		 * or MFPC bit set
+		 */
+		if (pWextState->roamProfile.MFPEnabled &&
+		    !(pWextState->roamProfile.MFPRequired ||
+		      pWextState->roamProfile.MFPCapable)) {
+			hdd_debug("Reset MFPEnabled");
+			pWextState->roamProfile.MFPEnabled = 0;
+		}
 		/* If parsing failed set the def value for the roam profile */
 		if (status)
 			hdd_set_def_rsne_override(&pWextState->roamProfile,

+ 1 - 0
core/sme/src/csr/csr_api_scan.c

@@ -3500,6 +3500,7 @@ static QDF_STATUS csr_prepare_scan_filter(tpAniSirGlobal mac_ctx,
 		}
 		filter->num_of_enc_type = idx;
 		filter->num_of_mc_enc_type = idx;
+		filter->ignore_pmf_cap = true;
 	} else {
 		filter->num_of_auth =
 			pFilter->authType.numEntries;