From 81c2cd909ca3e02790578d8220aa51432002ceef Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Sun, 1 Jul 2018 18:04:47 -0700 Subject: [PATCH] qcacld-3.0: Remove obsolete Link Quality Indication support CSR contains the remnants of a Link Quality Indication support. Since this is unused, remove it. Change-Id: I5235e204e8ec15c2d927e8b3a95e1f65cab4cf70 CRs-Fixed: 2276296 --- core/sme/inc/csr_api.h | 16 ---------------- core/sme/inc/csr_internal.h | 7 ------- core/sme/src/csr/csr_api_roam.c | 4 ---- 3 files changed, 27 deletions(-) diff --git a/core/sme/inc/csr_api.h b/core/sme/inc/csr_api.h index 2b888439289c..f6bac1cd67e9 100644 --- a/core/sme/inc/csr_api.h +++ b/core/sme/inc/csr_api.h @@ -591,20 +591,6 @@ typedef enum { eCSR_ROAM_RESULT_INVOKE_FAILED, } eCsrRoamResult; -/*---------------------------------------------------------------------------- - List of link quality indications HDD can receive from SME - --------------------------------------------------------------------------*/ -typedef enum { - eCSR_ROAM_LINK_QUAL_MIN_IND = -1, - - eCSR_ROAM_LINK_QUAL_POOR_IND = 0, /* bad link */ - eCSR_ROAM_LINK_QUAL_GOOD_IND = 1, /* acceptable for voice */ - eCSR_ROAM_LINK_QUAL_VERY_GOOD_IND = 2, /* suitable for voice */ - eCSR_ROAM_LINK_QUAL_EXCELLENT_IND = 3, /* suitable for voice */ - - eCSR_ROAM_LINK_QUAL_MAX_IND /* invalid value */ -} eCsrRoamLinkQualityInd; - typedef enum { eCSR_DISCONNECT_REASON_UNSPECIFIED = 0, eCSR_DISCONNECT_REASON_MIC_ERROR, @@ -1704,8 +1690,6 @@ const char *get_e_csr_roam_result_str(eCsrRoamResult val); const char *csr_phy_mode_str(eCsrPhyMode phy_mode); QDF_STATUS csr_set_phy_mode(tHalHandle hHal, uint32_t phyMode, enum band_info eBand, bool *pfRestartNeeded); -typedef void (*csr_roamLinkQualityIndCallback) - (eCsrRoamLinkQualityInd ind, void *pContext); typedef void (*tCsrStatsCallback)(void *stats, void *pContext); typedef void (*tCsrRssiCallback)(int8_t rssi, uint32_t staId, void *pContext); diff --git a/core/sme/inc/csr_internal.h b/core/sme/inc/csr_internal.h index 6e4d1ac51009..e02d2ad88939 100644 --- a/core/sme/inc/csr_internal.h +++ b/core/sme/inc/csr_internal.h @@ -713,11 +713,6 @@ struct csr_roam_connectedinfo { uint8_t staId; }; -struct csr_linkquality_indinfo { - csr_roamLinkQualityIndCallback callback; - void *context; -}; - #ifndef QCA_SUPPORT_CP_STATS struct csr_pestats_reqinfo { tListElem link; /* list links */ @@ -976,8 +971,6 @@ struct csr_roamstruct { tDblLinkList peStatsReqList; struct csr_tlstats_reqinfo tlStatsReqInfo; #endif - eCsrRoamLinkQualityInd vccLinkQuality; - struct csr_linkquality_indinfo linkQualityIndInfo; tCsrTimerInfo WaitForKeyTimerInfo; struct csr_roam_session *roamSession; uint32_t transactionId; /* Current transaction ID for internal use. */ diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index e83fe999936e..b9aaf721f44f 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -1198,8 +1198,6 @@ QDF_STATUS csr_start(tpAniSirGlobal pMac) for (i = 0; i < CSR_ROAM_SESSION_MAX; i++) status = csr_neighbor_roam_init(pMac, i); csr_init_tl_stats(pMac); - /* init the link quality indication also */ - pMac->roam.vccLinkQuality = eCSR_ROAM_LINK_QUAL_MIN_IND; if (!QDF_IS_STATUS_SUCCESS(status)) { sme_warn("csr_start: Couldn't Init HO control blk "); break; @@ -17440,7 +17438,6 @@ static void csr_roam_link_up(tpAniSirGlobal pMac, struct qdf_mac_addr bssid) (0 == pMac->roam.configParam.vccRssiThreshold) ? CSR_VCC_RSSI_THRESHOLD : pMac->roam.configParam.vccRssiThreshold; - pMac->roam.vccLinkQuality = eCSR_ROAM_LINK_QUAL_POOR_IND; /* Check for user misconfig of UL MAC Loss trigger threshold */ pMac->roam.configParam.vccUlMacLossThreshold = (0 == pMac->roam.configParam.vccUlMacLossThreshold) ? @@ -17481,7 +17478,6 @@ static void csr_roam_link_down(tpAniSirGlobal pMac, uint32_t sessionId) * corresponding timers */ csr_roam_dereg_statistics_req(pMac); - pMac->roam.vccLinkQuality = eCSR_ROAM_LINK_QUAL_POOR_IND; /* Indicate the neighbor roal algorithm about the disconnect * indication */