samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Keep wma_set_ibsskey_helper under CRYPTO_SET_KEY_CONVERGED

Browse Source 
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
This commit is contained in:
Abhishek Ambure
2019-09-24 12:40:56 +05:30
committed by nshrivas
parent 5a6f5c63fc
commit 23beaf5925
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/wma/src/wma_mgmt.c
View File

@@ -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", WMA_LOGD("Set IBSS link monitor timer: peer_num = %d timer_value = %d",
new_peer_num, new_timer_value_ms); 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_set_ibsskey_helper() - cached IBSS key in wma handle
* @wma_handle: wma handle * @wma_handle: wma handle
@@ -2487,7 +2490,6 @@ void wma_set_ibsskey_helper(tp_wma_handle wma_handle,
} }
#endif /* QCA_IBSS_SUPPORT */ #endif /* QCA_IBSS_SUPPORT */
#ifndef CRYPTO_SET_KEY_CONVERGED
void wma_set_bsskey(tp_wma_handle wma_handle, tpSetBssKeyParams key_info) void wma_set_bsskey(tp_wma_handle wma_handle, tpSetBssKeyParams key_info)
{ {
struct wma_set_key_params key_params; struct wma_set_key_params key_params;