diff options
| author | Sandeep Puligilla <spuligil@qca.qualcomm.com> | 2015-01-06 13:39:06 -0800 |
|---|---|---|
| committer | AnjaneeDevi Kapparapu <c_akappa@qti.qualcomm.com> | 2015-01-12 15:24:04 +0530 |
| commit | f90c2fef2ef1e142da871ff08eeb18e2681b7fc3 (patch) | |
| tree | fdc9171f4e6e034ce9d227237234f9e108adadad | |
| parent | cb63c0d92ce28a7577ef512a4a566841dabb01d8 (diff) | |
qcacld: Remove setrssifilter command
'setRssifilter' command is specific to pronto
and not needed in qcacld.
Change-Id: I87fa73d2e76faccbe3b4dc48f5214e1fb7fa014c
CRs-Fixed: 777804
| -rw-r--r-- | CORE/HDD/inc/wlan_hdd_wext.h | 6 | ||||
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_wext.c | 30 | ||||
| -rw-r--r-- | CORE/MAC/src/include/sirParams.h | 3 | ||||
| -rw-r--r-- | CORE/SME/inc/pmcApi.h | 7 | ||||
| -rw-r--r-- | CORE/SME/inc/smeInside.h | 3 | ||||
| -rw-r--r-- | CORE/SME/inc/sme_Api.h | 11 | ||||
| -rw-r--r-- | CORE/SME/src/pmc/pmcApi.c | 32 | ||||
| -rw-r--r-- | CORE/SME/src/sme_common/sme_Api.c | 17 | ||||
| -rw-r--r-- | CORE/SYS/legacy/src/utils/src/macTrace.c | 3 | ||||
| -rw-r--r-- | CORE/WDA/inc/wlan_qct_wda.h | 3 |
10 files changed, 10 insertions, 105 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_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/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/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*/ |
