Explorar o código

qcacld-3.0: Remove #ifdef FEATURE_WLAN_LFR from SME

The condition #ifdef FEATURE_WLAN_LFR is used to include some of
the roaming code. It has been defined for all the recent driver
builds. Roaming code underneath is permanent part of the driver.

Removed 2 instances of FEATURE_WLAN_LFR that were not removed
in the previous change.

CRs-Fixed: 936683
Change-Id: Ic1550cc4f15ebd835f24a1cadb7d6bd5ed45edab
Deepak Dhamdhere %!s(int64=9) %!d(string=hai) anos
pai
achega
4bd0d82d93
Modificáronse 2 ficheiros con 0 adicións e 4 borrados
  1. 0 2
      core/sme/src/csr/csr_api_roam.c
  2. 0 2
      core/sme/src/csr/csr_util.c

+ 0 - 2
core/sme/src/csr/csr_api_roam.c

@@ -7608,14 +7608,12 @@ CDF_STATUS csr_roam_process_disassoc_deauth(tpAniSirGlobal pMac, tSmeCmd *pComma
 							pMac, sessionId);
 			}
 #endif
-#ifdef FEATURE_WLAN_LFR
 			if (csr_roam_is_fast_roam_enabled(pMac, sessionId) &&
 				(csr_neighbor_roam_state_preauth_done(pMac,
 							sessionId))) {
 				csr_neighbor_roam_tranistion_preauth_done_to_disconnected(
 							pMac, sessionId);
 			}
-#endif
 		}
 		if (fDisassoc) {
 			status =

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

@@ -206,9 +206,7 @@ const char *get_e_roam_cmd_status_str(eRoamCmdStatus val)
 		CASE_RETURN_STR(eCSR_ROAM_SEND_ACTION_CNF);
 		CASE_RETURN_STR(eCSR_ROAM_SESSION_OPENED);
 		CASE_RETURN_STR(eCSR_ROAM_FT_REASSOC_FAILED);
-#ifdef FEATURE_WLAN_LFR
 		CASE_RETURN_STR(eCSR_ROAM_PMK_NOTIFY);
-#endif
 #ifdef FEATURE_WLAN_LFR_METRICS
 		CASE_RETURN_STR(eCSR_ROAM_PREAUTH_INIT_NOTIFY);
 		CASE_RETURN_STR(eCSR_ROAM_PREAUTH_STATUS_SUCCESS);