wlan: Fix for DUT not sending 11k beacon report
This is a regression issue caused by CCX Upload change, in
which if the CCX upload is defined DUT alway sends beacon report
to upper layer (wpa_supplicant) even though the beacon request
initiated by 11k RRM. There is no run time check done to differenciate
who triggered beacon request, as CCX, 11k and upload approach uses
RRM scanning as a common code.
The fix for this issue is to difference which module initiated
beacon request based on the message source and forward the beacon report
to that module.
Change-Id: Ie502843c5db8f0f7398d875493c9568a405fac82
CRs-Fixed: 611034
diff --git a/CORE/MAC/src/pe/include/rrmGlobal.h b/CORE/MAC/src/pe/include/rrmGlobal.h
index de8eda0..6b466c1 100644
--- a/CORE/MAC/src/pe/include/rrmGlobal.h
+++ b/CORE/MAC/src/pe/include/rrmGlobal.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -51,10 +51,6 @@
\brief Definitions for SME APIs
- Copyright 2008 (c) Qualcomm, Incorporated. All Rights Reserved.
-
- Qualcomm Confidential and Proprietary.
-
========================================================================*/
typedef enum eRrmRetStatus
@@ -65,6 +61,12 @@
eRRM_FAILURE
} tRrmRetStatus;
+typedef enum eRrmMsgReqSource
+{
+ eRRM_MSG_SOURCE_DRV = 1, /* for both 11k and legacy ccx */
+ eRRM_MSG_SOURCE_CCX_UPLOAD = 2, /* ccx upload approach */
+} tRrmMsgReqSource;
+
typedef struct sSirChannelInfo
{
tANI_U8 regulatoryClass;
@@ -84,6 +86,7 @@
tAniSSID ssId; //May be wilcard.
tANI_U16 uDialogToken;
tSirChannelList channelList; //From AP channel report.
+ tRrmMsgReqSource msgSource;
} tSirBeaconReportReqInd, * tpSirBeaconReportReqInd;