From 23beaf59253dcb2bbb5522592195f8a27007bb0e Mon Sep 17 00:00:00 2001 From: Abhishek Ambure Date: Tue, 24 Sep 2019 12:40:56 +0530 Subject: [PATCH] qcacld-3.0: Keep wma_set_ibsskey_helper under CRYPTO_SET_KEY_CONVERGED Fix compilation error caused if "CRYPTO_SET_KEY_CONVERGED" is enabled. Keeping WMA IBSS code under "QCA_IBSS_SUPPORT" change i.e. 2861885 pulled "wma_set_ibsskey_helper" function outof macro protected code "#ifndef CRYPTO_SET_KEY_CONVERGED", that caused compilation error on enabling "CRYPTO_SET_KEY_CONVERGED". Change-Id: I87650d094f5f39ffff94e1cce58cbb20e0aa0520 CRs-Fixed: 2533784 --- core/wma/src/wma_mgmt.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/wma/src/wma_mgmt.c b/core/wma/src/wma_mgmt.c index bf3da1dd3a..40a7f03944 100644 --- a/core/wma/src/wma_mgmt.c +++ b/core/wma/src/wma_mgmt.c @@ -2386,7 +2386,10 @@ void wma_adjust_ibss_heart_beat_timer(tp_wma_handle wma, WMA_LOGD("Set IBSS link monitor timer: peer_num = %d timer_value = %d", new_peer_num, new_timer_value_ms); } +#endif /* QCA_IBSS_SUPPORT */ +#ifndef CRYPTO_SET_KEY_CONVERGED +#ifdef QCA_IBSS_SUPPORT /** * wma_set_ibsskey_helper() - cached IBSS key in wma handle * @wma_handle: wma handle @@ -2487,7 +2490,6 @@ void wma_set_ibsskey_helper(tp_wma_handle wma_handle, } #endif /* QCA_IBSS_SUPPORT */ -#ifndef CRYPTO_SET_KEY_CONVERGED void wma_set_bsskey(tp_wma_handle wma_handle, tpSetBssKeyParams key_info) { struct wma_set_key_params key_params;