summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2015-01-12 15:05:09 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2015-01-12 15:05:09 -0800
commit25ea207b01208e769a66be0446410b0fcf3602de (patch)
treeafb31e97fbd12a70883dc763a5e3838b9d1f173e
parent16591cb73c6e32880a11961653ff542dc6a9854f (diff)
parentcd5338e33ee272065cb09f6c96d9db0f8b9b2bc4 (diff)
Merge "Release 4.0.10.12 QCACLD WLAN Driver"
-rw-r--r--CORE/HDD/inc/wlan_hdd_wext.h6
-rwxr-xr-xCORE/HDD/src/wlan_hdd_main.c2
-rw-r--r--CORE/HDD/src/wlan_hdd_wext.c30
-rw-r--r--CORE/MAC/inc/qwlan_version.h4
-rw-r--r--CORE/MAC/src/include/sirParams.h3
-rw-r--r--CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c1
-rw-r--r--CORE/MAC/src/pe/lim/limSession.c13
-rw-r--r--CORE/SERVICES/HIF/PCIe/hif_pci.c5
-rw-r--r--CORE/SERVICES/HIF/PCIe/if_pci.c24
-rw-r--r--CORE/SERVICES/HIF/PCIe/if_pci.h3
-rw-r--r--CORE/SME/inc/pmcApi.h7
-rw-r--r--CORE/SME/inc/smeInside.h3
-rw-r--r--CORE/SME/inc/sme_Api.h11
-rw-r--r--CORE/SME/src/pmc/pmcApi.c32
-rw-r--r--CORE/SME/src/sme_common/sme_Api.c17
-rw-r--r--CORE/SYS/legacy/src/utils/src/macTrace.c3
-rw-r--r--CORE/WDA/inc/wlan_qct_wda.h3
17 files changed, 53 insertions, 114 deletions
diff --git a/CORE/HDD/inc/wlan_hdd_wext.h b/CORE/HDD/inc/wlan_hdd_wext.h
index 988c44297b99..b234a5ba470f 100644
--- a/CORE/HDD/inc/wlan_hdd_wext.h
+++ b/CORE/HDD/inc/wlan_hdd_wext.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -374,10 +374,6 @@ extern int iw_get_auth(struct net_device *dev,struct iw_request_info *info,
VOS_STATUS iw_set_pno(struct net_device *dev, struct iw_request_info *info,
union iwreq_data *wrqu, char *extra, int nOffset);
-
-VOS_STATUS iw_set_rssi_filter(struct net_device *dev, struct iw_request_info *info,
- union iwreq_data *wrqu, char *extra, int nOffset);
-
VOS_STATUS iw_set_power_params(struct net_device *dev, struct iw_request_info *info,
union iwreq_data *wrqu, char *extra, int nOffset);
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index f6825a9773d6..7732c23662fe 100755
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -8179,7 +8179,7 @@ int hdd_stop (struct net_device *dev)
ENTER();
- MTRACE(vos_trace(VOS_MODULE_ID_HDD, TRACE_CODE_HDD_OPEN_REQUEST,
+ MTRACE(vos_trace(VOS_MODULE_ID_HDD, TRACE_CODE_HDD_STOP_REQUEST,
pAdapter->sessionId, pAdapter->device_mode));
ret = wlan_hdd_validate_context(pHddCtx);
diff --git a/CORE/HDD/src/wlan_hdd_wext.c b/CORE/HDD/src/wlan_hdd_wext.c
index 84a2e998e023..d477ccf810e9 100644
--- a/CORE/HDD/src/wlan_hdd_wext.c
+++ b/CORE/HDD/src/wlan_hdd_wext.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011-2014 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2015 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -3825,12 +3825,6 @@ static int iw_set_priv(struct net_device *dev,
kfree(cmd);
return (vos_status == VOS_STATUS_SUCCESS) ? 0 : -EINVAL;
}
- else if( strncasecmp(cmd, "rssifilter",10) == 0 ) {
- hddLog( VOS_TRACE_LEVEL_INFO, "rssifilter");
- vos_status = iw_set_rssi_filter(dev, info, wrqu, cmd, 10);
- kfree(cmd);
- return (vos_status == VOS_STATUS_SUCCESS) ? 0 : -EINVAL;
- }
#endif /*FEATURE_WLAN_SCAN_PNO*/
else if( strncasecmp(cmd, "powerparams",11) == 0 ) {
hddLog( VOS_TRACE_LEVEL_INFO, "powerparams");
@@ -9521,28 +9515,6 @@ VOS_STATUS iw_set_pno(struct net_device *dev, struct iw_request_info *info,
return VOS_STATUS_SUCCESS;
}/*iw_set_pno*/
-VOS_STATUS iw_set_rssi_filter(struct net_device *dev, struct iw_request_info *info,
- union iwreq_data *wrqu, char *extra, int nOffset)
-{
- hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
- v_U8_t rssiThreshold = 0;
- v_U8_t nRead;
-
- nRead = sscanf(extra + nOffset,"%hhu",
- &rssiThreshold);
-
- if ( 1 != nRead )
- {
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_WARN,
- "Incorrect format");
- return VOS_STATUS_E_FAILURE;
- }
-
- sme_SetRSSIFilter(WLAN_HDD_GET_HAL_CTX(pAdapter), rssiThreshold);
- return VOS_STATUS_SUCCESS;
-}
-
-
static int iw_set_pno_priv(struct net_device *dev,
struct iw_request_info *info,
union iwreq_data *wrqu, char *extra)
diff --git a/CORE/MAC/inc/qwlan_version.h b/CORE/MAC/inc/qwlan_version.h
index bf5e4c04d6bf..d5e99ee7611c 100644
--- a/CORE/MAC/inc/qwlan_version.h
+++ b/CORE/MAC/inc/qwlan_version.h
@@ -42,9 +42,9 @@ BRIEF DESCRIPTION:
#define QWLAN_VERSION_MINOR 0
#define QWLAN_VERSION_PATCH 10
#define QWLAN_VERSION_EXTRA ""
-#define QWLAN_VERSION_BUILD 011
+#define QWLAN_VERSION_BUILD 12
-#define QWLAN_VERSIONSTR "4.0.10.011"
+#define QWLAN_VERSIONSTR "4.0.10.12"
#define AR6320_REV1_VERSION 0x5000000
diff --git a/CORE/MAC/src/include/sirParams.h b/CORE/MAC/src/include/sirParams.h
index 407c11674b2e..db441d7b62c8 100644
--- a/CORE/MAC/src/include/sirParams.h
+++ b/CORE/MAC/src/include/sirParams.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -447,7 +447,6 @@ typedef struct sSirMbMsgP2p
#define SIR_HAL_SET_PNO_REQ (SIR_HAL_ITC_MSG_TYPES_BEGIN + 170)
#define SIR_HAL_SET_PNO_CHANGED_IND (SIR_HAL_ITC_MSG_TYPES_BEGIN + 171)
#define SIR_HAL_UPDATE_SCAN_PARAMS (SIR_HAL_ITC_MSG_TYPES_BEGIN + 172)
-#define SIR_HAL_SET_RSSI_FILTER_REQ (SIR_HAL_ITC_MSG_TYPES_BEGIN + 173)
#endif // FEATURE_WLAN_SCAN_PNO
diff --git a/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c b/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c
index e7900565b787..640a388657a3 100644
--- a/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c
+++ b/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c
@@ -412,7 +412,6 @@ limProcessMlmStartCnf(tpAniSirGlobal pMac, tANI_U32 *pMsgBuf)
peDeleteSession(pMac,psessionEntry);
psessionEntry = NULL;
PELOGE(limLog(pMac, LOGE,FL("Start BSS Failed "));)
- return;
}
/// Send response to Host
limSendSmeStartBssRsp(pMac, eWNI_SME_START_BSS_RSP,
diff --git a/CORE/MAC/src/pe/lim/limSession.c b/CORE/MAC/src/pe/lim/limSession.c
index 4461ef3cf90f..4941e3a31ced 100644
--- a/CORE/MAC/src/pe/lim/limSession.c
+++ b/CORE/MAC/src/pe/lim/limSession.c
@@ -105,8 +105,10 @@ void pe_reset_protection_callback(void *ptr)
{
tpPESession pe_session_entry = (tpPESession)ptr;
tpAniSirGlobal mac_ctx = (tpAniSirGlobal)pe_session_entry->mac_ctx;
+ int8_t i = 0;
tUpdateBeaconParams beacon_params;
tANI_U16 current_protection_state = 0;
+ tpDphHashNode station_hash_node = NULL;
if (pe_session_entry->valid == false) {
VOS_TRACE(VOS_MODULE_ID_PE,
@@ -167,6 +169,17 @@ void pe_reset_protection_callback(void *ptr)
pe_session_entry->htOperMode = eSIR_HT_OP_MODE_PURE;
mac_ctx->lim.gHTOperMode = eSIR_HT_OP_MODE_PURE;
+ /* index 0, is self node, peers start from 1 */
+ for(i = 1 ; i < mac_ctx->lim.gLimAssocStaLimit ; i++)
+ {
+ station_hash_node = dphGetHashEntry(mac_ctx, i,
+ &pe_session_entry->dph.dphHashTable);
+ if (NULL == station_hash_node)
+ continue;
+ limDecideApProtection(mac_ctx, station_hash_node->staAddr,
+ &beacon_params, pe_session_entry);
+ }
+
if ((current_protection_state != pe_session_entry->old_protection_state) &&
(VOS_FALSE == mac_ctx->sap.SapDfsInfo.is_dfs_cac_timer_running)) {
VOS_TRACE(VOS_MODULE_ID_PE,
diff --git a/CORE/SERVICES/HIF/PCIe/hif_pci.c b/CORE/SERVICES/HIF/PCIe/hif_pci.c
index fd2fd5fb057c..96db6a829aaa 100644
--- a/CORE/SERVICES/HIF/PCIe/hif_pci.c
+++ b/CORE/SERVICES/HIF/PCIe/hif_pci.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013-2014 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2015 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -1715,6 +1715,9 @@ HIFStop(HIF_DEVICE *hif_device)
return; /* already stopped or stopping */
}
+ if (sc->hdd_startup_reinit_flag == TRUE)
+ return; /* If still in wlan_hdd_startup or wlan_hdd_reinit nop. */
+
sc->hif_init_done = FALSE;
if (hif_state->started) {
diff --git a/CORE/SERVICES/HIF/PCIe/if_pci.c b/CORE/SERVICES/HIF/PCIe/if_pci.c
index 271a7d830ad8..1f5c4fe02be2 100644
--- a/CORE/SERVICES/HIF/PCIe/if_pci.c
+++ b/CORE/SERVICES/HIF/PCIe/if_pci.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013-2014 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2015 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -976,8 +976,11 @@ again:
init_waitqueue_head(&ol_sc->sc_osdev->event_queue);
ret = hif_init_adf_ctx(ol_sc);
- if (ret == 0)
+ if (ret == 0) {
+ sc->hdd_startup_reinit_flag = true;
ret = hdd_wlan_startup(&pdev->dev, ol_sc);
+ sc->hdd_startup_reinit_flag = false;
+ }
if (ret) {
hif_disable_isr(ol_sc);
@@ -1316,8 +1319,10 @@ again:
ret = hif_init_adf_ctx(ol_sc);
if (ret == 0) {
+ sc->hdd_startup_reinit_flag = true;
if (VOS_STATUS_SUCCESS == hdd_wlan_re_init(ol_sc))
ret = 0;
+ sc->hdd_startup_reinit_flag = false;
}
/* Re-enable ASPM after firmware/OTP download is complete */
@@ -1404,6 +1409,15 @@ hif_nointrs(struct hif_pci_softc *sc)
{
int i;
+ if (sc->hdd_startup_reinit_flag) {
+ pr_err("%s: WARN: In HDD startup or reinit\n", __func__);
+ return;
+ }
+
+ if (!sc->pdev) {
+ pr_err("%s: pdev is NULL\n", __func__);
+ return;
+ }
if (sc->num_msi_intrs > 0) {
/* MSI interrupt(s) */
for (i = 0; i < sc->num_msi_intrs; i++) {
@@ -2134,7 +2148,11 @@ void hif_disable_isr(void *ol_sc)
struct ol_softc *sc = (struct ol_softc *)ol_sc;
struct hif_pci_softc *hif_sc = sc->hif_sc;
struct ol_softc *scn;
-
+ if (hif_sc->hdd_startup_reinit_flag) {
+ pr_err("%s: WARN: in HDD starrtup or reinit function\n",
+ __func__);
+ return;
+ }
scn = hif_sc->ol_sc;
hif_nointrs(hif_sc);
#if CONFIG_PCIE_64BIT_MSI
diff --git a/CORE/SERVICES/HIF/PCIe/if_pci.h b/CORE/SERVICES/HIF/PCIe/if_pci.h
index 66980697fb32..a4d0e3416f26 100644
--- a/CORE/SERVICES/HIF/PCIe/if_pci.h
+++ b/CORE/SERVICES/HIF/PCIe/if_pci.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013-2014 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2015 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -89,6 +89,7 @@ struct hif_pci_softc {
atomic_t pci_link_suspended;
bool hif_init_done;
bool recovery;
+ bool hdd_startup_reinit_flag;
int htc_endpoint;
};
#define TARGID(sc) ((A_target_id_t)(&(sc)->mem))
diff --git a/CORE/SME/inc/pmcApi.h b/CORE/SME/inc/pmcApi.h
index 8eeced65f77d..1cb15dcad72e 100644
--- a/CORE/SME/inc/pmcApi.h
+++ b/CORE/SME/inc/pmcApi.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011-2012, 2014 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2015 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -35,10 +35,6 @@
* Description: Power Management Control (PMC) API definitions.
-
-
-
-
*
******************************************************************************/
@@ -448,7 +444,6 @@ extern tANI_BOOLEAN pmcAllowImps( tHalHandle hHal );
typedef void(*preferredNetworkFoundIndCallback)(void *callbackContext, tpSirPrefNetworkFoundInd pPrefNetworkFoundInd);
extern eHalStatus pmcSetPreferredNetworkList(tHalHandle hHal, tpSirPNOScanReq pRequest, tANI_U8 sessionId, preferredNetworkFoundIndCallback callbackRoutine, void *callbackContext);
-extern eHalStatus pmcSetRssiFilter(tHalHandle hHal, v_U8_t rssiThreshold);
#endif // FEATURE_WLAN_SCAN_PNO
#ifdef WLAN_FEATURE_PACKET_FILTERING
diff --git a/CORE/SME/inc/smeInside.h b/CORE/SME/inc/smeInside.h
index 30002c99f87a..9d61add7196b 100644
--- a/CORE/SME/inc/smeInside.h
+++ b/CORE/SME/inc/smeInside.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -276,7 +276,6 @@ eHalStatus pmcSetNSOffload (tHalHandle hHal, tpSirHostOffloadReq pRequest, tANI_
#ifdef FEATURE_WLAN_SCAN_PNO
eHalStatus pmcSetPreferredNetworkList(tHalHandle hHal, tpSirPNOScanReq pRequest, tANI_U8 sessionId, preferredNetworkFoundIndCallback callbackRoutine, void *callbackContext);
eHalStatus pmcUpdateScanParams(tHalHandle hHal, tCsrConfig *pRequest, tCsrChannel *pChannelList, tANI_U8 b11dResolved);
-eHalStatus pmcSetRssiFilter(tHalHandle hHal, v_U8_t rssiThreshold);
#endif // FEATURE_WLAN_SCAN_PNO
eHalStatus pmcSetPowerParams(tHalHandle hHal, tSirSetPowerParamsReq* pwParams, tANI_BOOLEAN forced);
diff --git a/CORE/SME/inc/sme_Api.h b/CORE/SME/inc/sme_Api.h
index d00ebe731197..07eaddde22d7 100644
--- a/CORE/SME/inc/sme_Api.h
+++ b/CORE/SME/inc/sme_Api.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -2254,15 +2254,6 @@ eHalStatus sme_GetCfgValidChannels(tHalHandle hHal, tANI_U8 *aValidChannels, tAN
---------------------------------------------------------------------------*/
eHalStatus sme_SetPreferredNetworkList (tHalHandle hHal, tpSirPNOScanReq pRequest, tANI_U8 sessionId, preferredNetworkFoundIndCallback callbackRoutine, void *callbackContext );
-/* ---------------------------------------------------------------------------
- \fn sme_SetRSSIFilter
- \brief API to set RSSI Filter feature.
- \param hHal - The handle returned by macOpen.
- \param pRequest - Pointer to the offload request.
- \return eHalStatus
- ---------------------------------------------------------------------------*/
-eHalStatus sme_SetRSSIFilter(tHalHandle hHal, v_U8_t rssiThreshold);
-
/******************************************************************************
*
* Name: sme_PreferredNetworkFoundInd
diff --git a/CORE/SME/src/pmc/pmcApi.c b/CORE/SME/src/pmc/pmcApi.c
index c0b95013d702..0b4b5588e78d 100644
--- a/CORE/SME/src/pmc/pmcApi.c
+++ b/CORE/SME/src/pmc/pmcApi.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -2957,36 +2957,6 @@ eHalStatus pmcSetPreferredNetworkList
return eHAL_STATUS_SUCCESS;
}
-eHalStatus pmcSetRssiFilter(tHalHandle hHal, v_U8_t rssiThreshold)
-{
- tpSirSetRSSIFilterReq pRequestBuf;
- vos_msg_t msg;
-
-
- pRequestBuf = vos_mem_malloc(sizeof(tpSirSetRSSIFilterReq));
- if (NULL == pRequestBuf)
- {
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for PNO request", __func__);
- return eHAL_STATUS_FAILED_ALLOC;
- }
-
-
- pRequestBuf->rssiThreshold = rssiThreshold;
-
- msg.type = WDA_SET_RSSI_FILTER_REQ;
- msg.reserved = 0;
- msg.bodyptr = pRequestBuf;
- if (!VOS_IS_STATUS_SUCCESS(vos_mq_post_message(VOS_MODULE_ID_WDA, &msg)))
- {
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: Not able to post WDA_SET_PNO_REQ message to WDA", __func__);
- vos_mem_free(pRequestBuf);
- return eHAL_STATUS_FAILURE;
- }
-
- return eHAL_STATUS_SUCCESS;
-}
-
-
eHalStatus pmcUpdateScanParams(tHalHandle hHal, tCsrConfig *pRequest, tCsrChannel *pChannelList, tANI_U8 b11dResolved)
{
tpSirUpdateScanParams pRequestBuf;
diff --git a/CORE/SME/src/sme_common/sme_Api.c b/CORE/SME/src/sme_common/sme_Api.c
index 416f7470eac2..b62589049534 100644
--- a/CORE/SME/src/sme_common/sme_Api.c
+++ b/CORE/SME/src/sme_common/sme_Api.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -6934,21 +6934,6 @@ eHalStatus sme_SetPreferredNetworkList (tHalHandle hHal, tpSirPNOScanReq pReques
return (status);
}
-
-eHalStatus sme_SetRSSIFilter(tHalHandle hHal, v_U8_t rssiThreshold)
-{
- tpAniSirGlobal pMac = PMAC_STRUCT( hHal );
- eHalStatus status;
-
- if ( eHAL_STATUS_SUCCESS == ( status = sme_AcquireGlobalLock( &pMac->sme ) ) )
- {
- pmcSetRssiFilter(hHal, rssiThreshold);
- sme_ReleaseGlobalLock( &pMac->sme );
- }
-
- return (status);
-}
-
#endif // FEATURE_WLAN_SCAN_PNO
eHalStatus sme_SetPowerParams(tHalHandle hHal, tSirSetPowerParamsReq* pwParams, tANI_BOOLEAN forced)
diff --git a/CORE/SYS/legacy/src/utils/src/macTrace.c b/CORE/SYS/legacy/src/utils/src/macTrace.c
index c4700d03cc69..8b17952d9e0d 100644
--- a/CORE/SYS/legacy/src/utils/src/macTrace.c
+++ b/CORE/SYS/legacy/src/utils/src/macTrace.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013-2014 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2015 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -743,7 +743,6 @@ tANI_U8* macTraceGetWdaMsgString( tANI_U16 wdaMsg )
CASE_RETURN_STRING(WDA_FTM_CMD_RSP);
#ifdef FEATURE_WLAN_SCAN_PNO
CASE_RETURN_STRING(WDA_SET_PNO_REQ);
- CASE_RETURN_STRING(WDA_SET_RSSI_FILTER_REQ);
CASE_RETURN_STRING(WDA_UPDATE_SCAN_PARAMS_REQ);
CASE_RETURN_STRING(WDA_SET_PNO_CHANGED_IND);
CASE_RETURN_STRING(WDA_SME_SCAN_CACHE_UPDATED);
diff --git a/CORE/WDA/inc/wlan_qct_wda.h b/CORE/WDA/inc/wlan_qct_wda.h
index 5d0ced563d7e..2bc001b3f83b 100644
--- a/CORE/WDA/inc/wlan_qct_wda.h
+++ b/CORE/WDA/inc/wlan_qct_wda.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -815,7 +815,6 @@ tSirRetStatus uMacPostCtrlMsg(void* pSirGlobal, tSirMbMsg* pMb);
#ifdef FEATURE_WLAN_SCAN_PNO
/*Requests sent to lower driver*/
#define WDA_SET_PNO_REQ SIR_HAL_SET_PNO_REQ
-#define WDA_SET_RSSI_FILTER_REQ SIR_HAL_SET_RSSI_FILTER_REQ
#define WDA_UPDATE_SCAN_PARAMS_REQ SIR_HAL_UPDATE_SCAN_PARAMS
/*Indication comming from lower driver*/