summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKrunal Soni <ksoni@qca.qualcomm.com>2015-10-01 11:35:41 -0700
committerAnjaneedevi Kapparapu <akappa@codeaurora.org>2015-10-06 15:51:53 +0530
commit96c02aeb2beb61809d71e205bcd1ccc05555cd59 (patch)
tree10198ee951b61d539a50f3c5758a167de0033f91
parentb5e3be697a46635e17d371060a2733d9503be48c (diff)
qcacld-2.0: Fix to allow roaming to AP with same PMF configuration
This fix allows station to roam to the AP which has same pmf profile or configuration as current connected AP. CRs-Fixed: 871445 Change-Id: Iec0905e1ff33c46f93f3d5f159d155e37a28f470
-rw-r--r--CORE/MAC/inc/sirApi.h3
-rw-r--r--CORE/SERVICES/WMA/wma.c4
-rw-r--r--CORE/SME/src/csr/csrApiRoam.c4
3 files changed, 11 insertions, 0 deletions
diff --git a/CORE/MAC/inc/sirApi.h b/CORE/MAC/inc/sirApi.h
index 014c57eec4cb..0faf448b14ee 100644
--- a/CORE/MAC/inc/sirApi.h
+++ b/CORE/MAC/inc/sirApi.h
@@ -3706,6 +3706,9 @@ typedef struct
tANI_U8 mcencryption;
tANI_U8 ChannelCount;
tANI_U8 ChannelCache[SIR_ROAM_MAX_CHANNELS];
+#ifdef WLAN_FEATURE_11W
+ tANI_BOOLEAN MFPEnabled;
+#endif
} tSirRoamNetworkType;
diff --git a/CORE/SERVICES/WMA/wma.c b/CORE/SERVICES/WMA/wma.c
index dd4837d5d687..f4e8c6e6c31c 100644
--- a/CORE/SERVICES/WMA/wma.c
+++ b/CORE/SERVICES/WMA/wma.c
@@ -9695,6 +9695,10 @@ v_VOID_t wma_roam_scan_fill_ap_profile(tp_wma_handle wma_handle, tpAniSirGlobal
eCsrEncryptionType_to_rsn_cipherset(roam_req->ConnectedNetwork.mcencryption);
ap_profile_p->rsn_mcastmgmtcipherset = ap_profile_p->rsn_mcastcipherset;
ap_profile_p->rssi_threshold = roam_req->RoamRssiDiff;
+#ifdef WLAN_FEATURE_11W
+ if (roam_req->ConnectedNetwork.MFPEnabled)
+ ap_profile_p->flags |= WMI_AP_PROFILE_FLAG_PMF;
+#endif
}
}
diff --git a/CORE/SME/src/csr/csrApiRoam.c b/CORE/SME/src/csr/csrApiRoam.c
index 9a77e8ba1222..ed5535d20b9e 100644
--- a/CORE/SME/src/csr/csrApiRoam.c
+++ b/CORE/SME/src/csr/csrApiRoam.c
@@ -17093,6 +17093,10 @@ eHalStatus csrRoamOffloadScan(tpAniSirGlobal pMac, tANI_U8 sessionId,
pMac->roam.roamSession[sessionId].connectedProfile.EncryptionType;
pRequestBuf->ConnectedNetwork.mcencryption =
pMac->roam.roamSession[sessionId].connectedProfile.mcEncryptionType;
+#ifdef WLAN_FEATURE_11W
+ pRequestBuf->ConnectedNetwork.MFPEnabled =
+ pMac->roam.roamSession[sessionId].connectedProfile.MFPEnabled;
+#endif
pRequestBuf->delay_before_vdev_stop =
pNeighborRoamInfo->cfgParams.delay_before_vdev_stop;
pRequestBuf->OpportunisticScanThresholdDiff =