Merge "wlan: Protect sme_RrmIssueScanReq with sme lock" into wlan-driver.lnx.1.0 (e67de3a6) · Commits · e / devices / android_kernel_fairphone_FP3

CORE/SME/src/rrm/sme_rrm.c

+7 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1311,11 +1311,17 @@ eHalStatus sme_RrmMsgProcessor( tpAniSirGlobal pMac, v_U16_t msg_type,
	void rrmIterMeasTimerHandle( v_PVOID_t userData )		void rrmIterMeasTimerHandle( v_PVOID_t userData )
	{		{
	tpAniSirGlobal pMac = (tpAniSirGlobal) userData;		tpAniSirGlobal pMac = (tpAniSirGlobal) userData;
			eHalStatus status = eHAL_STATUS_FAILURE;

	#if defined WLAN_VOWIFI_DEBUG		#if defined WLAN_VOWIFI_DEBUG
	smsLog( pMac, LOGE, "Randomization timer expired...send on next channel ");		smsLog( pMac, LOGE, "Randomization timer expired...send on next channel ");
	#endif		#endif
	//Issue a scan req for next channel.		//Issue a scan req for next channel.
			status = sme_AcquireGlobalLock(&pMac->sme);
			if (HAL_STATUS_SUCCESS(status)) {
	sme_RrmIssueScanReq(pMac);		sme_RrmIssueScanReq(pMac);
			sme_ReleaseGlobalLock(&pMac->sme);
			}
	}		}

	/* ---------------------------------------------------------------------------		/* ---------------------------------------------------------------------------