From 26b28f5e205885e2cebb95e77a087d1f3102f89b Mon Sep 17 00:00:00 2001 From: Utkarsh Bhatnagar Date: Sun, 17 May 2020 18:29:20 +0530 Subject: [PATCH] qcacld-3.0: Consider both peer and Self Capabilities for PMF Set PMF enabled bit for Association Frame only when both peer and self supports it. Change-Id: I11994da4db87e6a83b7ebe308720c45a9e2f0173 CRs-Fixed: 2686114 --- core/mac/src/pe/lim/lim_process_assoc_req_frame.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/mac/src/pe/lim/lim_process_assoc_req_frame.c b/core/mac/src/pe/lim/lim_process_assoc_req_frame.c index 8e9c45ea6eb2..4f1771cca47f 100644 --- a/core/mac/src/pe/lim/lim_process_assoc_req_frame.c +++ b/core/mac/src/pe/lim/lim_process_assoc_req_frame.c @@ -852,8 +852,11 @@ enum mac_status_code lim_check_rsn_ie(struct pe_session *session, pe_err("vdev is NULL"); return eSIR_MAC_UNSPEC_FAILURE_STATUS; } + if ((peer_crypto_params.rsn_caps & + WLAN_CRYPTO_RSN_CAP_MFP_ENABLED) && + wlan_crypto_vdev_is_pmf_enabled(vdev)) + *pmf_connection = true; - *pmf_connection = wlan_crypto_vdev_is_pmf_enabled(vdev); wlan_objmgr_vdev_release_ref(vdev, WLAN_LEGACY_MAC_ID); return lim_check_crypto_param(assoc_req, &peer_crypto_params);