samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Fix -Wmissing-prototypes in csr_api_scan

Browse Source 
We want to enable the compiler's -Wmissing-prototypes switch, but
there is existing code that is generating warnings. Fix all warnings
in csr_api_scan.

Change-Id: Ib383b247ff466a5b99cb97cc504a2dddf79a8b66
CRs-Fixed: 1075575
This commit is contained in:
Jeff Johnson
2016-10-14 08:07:36 -07:00
committed by qcabuildsw
parent 29e2ca1940
commit 00fa67df81
1 changed files with 49 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
core/sme/src/csr/csr_api_scan.c
View File

@@ -645,9 +645,9 @@ release_cmd:
return status; return status;
} }
QDF_STATUS csr_issue_roam_after_lostlink_scan(tpAniSirGlobal pMac, static QDF_STATUS csr_issue_roam_after_lostlink_scan(tpAniSirGlobal pMac,
uint32_t sessionId, uint32_t sessionId,
eCsrRoamReason reason) eCsrRoamReason reason)
{ {
QDF_STATUS status = QDF_STATUS_E_FAILURE; QDF_STATUS status = QDF_STATUS_E_FAILURE;
tScanResultHandle hBSSList = NULL; tScanResultHandle hBSSList = NULL;
@@ -2157,7 +2157,7 @@ QDF_STATUS csr_scan_get_result(tpAniSirGlobal pMac,
* csr_scan_get_result returns with a failure because * csr_scan_get_result returns with a failure because
* of not being able to find the roaming BSS. * of not being able to find the roaming BSS.
*/ */
bool csr_scan_flush_denied(tpAniSirGlobal pMac) static bool csr_scan_flush_denied(tpAniSirGlobal pMac)
{ {
uint8_t sessionId; uint8_t sessionId;
@@ -2265,7 +2265,7 @@ void csr_scan_flush_bss_entry(tpAniSirGlobal pMac,
* @return Status * @return Status
*/ */
QDF_STATUS csr_check11d_channel(uint8_t channelId, uint8_t *pChannelList, static QDF_STATUS csr_check11d_channel(uint8_t channelId, uint8_t *pChannelList,
uint32_t numChannels) uint32_t numChannels)
{ {
QDF_STATUS status = QDF_STATUS_E_FAILURE; QDF_STATUS status = QDF_STATUS_E_FAILURE;
@@ -2526,8 +2526,9 @@ QDF_STATUS csr_scanning_state_msg_processor(tpAniSirGlobal pMac,
return status; return status;
} }
void csr_check_n_save_wsc_ie(tpAniSirGlobal pMac, tSirBssDescription *pNewBssDescr, static void csr_check_n_save_wsc_ie(tpAniSirGlobal pMac,
tSirBssDescription *pOldBssDescr) tSirBssDescription *pNewBssDescr,
tSirBssDescription *pOldBssDescr)
{ {
int idx, len; int idx, len;
uint8_t *pbIe; uint8_t *pbIe;
@@ -2563,10 +2564,11 @@ void csr_check_n_save_wsc_ie(tpAniSirGlobal pMac, tSirBssDescription *pNewBssDes
} }
/* pIes may be NULL */ /* pIes may be NULL */
bool csr_remove_dup_bss_description(tpAniSirGlobal pMac, static bool csr_remove_dup_bss_description(tpAniSirGlobal pMac,
tSirBssDescription *bss_dscp, tSirBssDescription *bss_dscp,
tDot11fBeaconIEs *pIes, tAniSSID *pSsid, tDot11fBeaconIEs *pIes,
unsigned long *timer, bool fForced) tAniSSID *pSsid,
unsigned long *timer, bool fForced)
{ {
tListElem *pEntry; tListElem *pEntry;
tCsrScanResult *scan_entry; tCsrScanResult *scan_entry;
@@ -2648,9 +2650,10 @@ bool csr_remove_dup_bss_description(tpAniSirGlobal pMac,
return fRC; return fRC;
} }
QDF_STATUS csr_add_pmkid_candidate_list(tpAniSirGlobal pMac, uint32_t sessionId, static QDF_STATUS csr_add_pmkid_candidate_list(tpAniSirGlobal pMac,
tSirBssDescription *pBssDesc, uint32_t sessionId,
tDot11fBeaconIEs *pIes) tSirBssDescription *pBssDesc,
tDot11fBeaconIEs *pIes)
{ {
QDF_STATUS status = QDF_STATUS_E_FAILURE; QDF_STATUS status = QDF_STATUS_E_FAILURE;
tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId);
@@ -2709,10 +2712,10 @@ QDF_STATUS csr_add_pmkid_candidate_list(tpAniSirGlobal pMac, uint32_t sessionId,
* profile. If it is found, it return the sessionId, else it return invalid * profile. If it is found, it return the sessionId, else it return invalid
* sessionID * sessionID
*/ */
QDF_STATUS csr_process_bss_desc_for_pmkid_list(tpAniSirGlobal pMac, static QDF_STATUS csr_process_bss_desc_for_pmkid_list(tpAniSirGlobal pMac,
tSirBssDescription *pBssDesc, tSirBssDescription *pBssDesc,
tDot11fBeaconIEs *pIes, tDot11fBeaconIEs *pIes,
uint8_t sessionId) uint8_t sessionId)
{ {
tCsrRoamSession *pSession; tCsrRoamSession *pSession;
tDot11fBeaconIEs *pIesLocal = pIes; tDot11fBeaconIEs *pIesLocal = pIes;
@@ -2753,9 +2756,10 @@ QDF_STATUS csr_process_bss_desc_for_pmkid_list(tpAniSirGlobal pMac,
} }
#ifdef FEATURE_WLAN_WAPI #ifdef FEATURE_WLAN_WAPI
QDF_STATUS csr_add_bkid_candidate_list(tpAniSirGlobal pMac, uint32_t sessionId, static QDF_STATUS csr_add_bkid_candidate_list(tpAniSirGlobal pMac,
tSirBssDescription *pBssDesc, uint32_t sessionId,
tDot11fBeaconIEs *pIes) tSirBssDescription *pBssDesc,
tDot11fBeaconIEs *pIes)
{ {
QDF_STATUS status = QDF_STATUS_E_FAILURE; QDF_STATUS status = QDF_STATUS_E_FAILURE;
tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId);
@@ -2803,9 +2807,9 @@ QDF_STATUS csr_add_bkid_candidate_list(tpAniSirGlobal pMac, uint32_t sessionId,
* This function checks whether new AP is found for the current connected * This function checks whether new AP is found for the current connected
* profile, if so add to BKIDCandidateList * profile, if so add to BKIDCandidateList
*/ */
bool csr_process_bss_desc_for_bkid_list(tpAniSirGlobal pMac, static bool csr_process_bss_desc_for_bkid_list(tpAniSirGlobal pMac,
tSirBssDescription *pBssDesc, tSirBssDescription *pBssDesc,
tDot11fBeaconIEs *pIes) tDot11fBeaconIEs *pIes)
{ {
bool fRC = false; bool fRC = false;
tDot11fBeaconIEs *pIesLocal = pIes; tDot11fBeaconIEs *pIesLocal = pIes;
@@ -3485,9 +3489,9 @@ QDF_STATUS csr_set_country_code(tpAniSirGlobal pMac, uint8_t *pCountry)
/* caller allocated memory for pNumChn and pChnPowerInfo */ /* caller allocated memory for pNumChn and pChnPowerInfo */
/* As input, *pNumChn has the size of the array of pChnPowerInfo */ /* As input, *pNumChn has the size of the array of pChnPowerInfo */
/* Upon return, *pNumChn has the number of channels assigned. */ /* Upon return, *pNumChn has the number of channels assigned. */
void csr_get_channel_power_info(tpAniSirGlobal pMac, tDblLinkList *list, static void csr_get_channel_power_info(tpAniSirGlobal pMac, tDblLinkList *list,
uint32_t *num_ch, uint32_t *num_ch,
struct channel_power *chn_pwr_info) struct channel_power *chn_pwr_info)
{ {
tListElem *entry; tListElem *entry;
uint32_t chn_idx = 0, idx; uint32_t chn_idx = 0, idx;
@@ -3512,7 +3516,7 @@ void csr_get_channel_power_info(tpAniSirGlobal pMac, tDblLinkList *list,
} }
#ifdef FEATURE_WLAN_DIAG_SUPPORT_CSR #ifdef FEATURE_WLAN_DIAG_SUPPORT_CSR
void csr_diag_apply_country_info(tpAniSirGlobal mac_ctx) static void csr_diag_apply_country_info(tpAniSirGlobal mac_ctx)
{ {
host_log_802_11d_pkt_type *p11dLog; host_log_802_11d_pkt_type *p11dLog;
struct channel_power chnPwrInfo[WNI_CFG_VALID_CHANNEL_LIST_LEN]; struct channel_power chnPwrInfo[WNI_CFG_VALID_CHANNEL_LIST_LEN];
@@ -3765,10 +3769,11 @@ void csr_reinit_scan_cmd(tpAniSirGlobal pMac, tSmeCmd *pCommand)
qdf_mem_set(&pCommand->u.scanCmd, sizeof(tScanCmd), 0); qdf_mem_set(&pCommand->u.scanCmd, sizeof(tScanCmd), 0);
} }
eCsrScanCompleteNextCommand csr_scan_get_next_command_state(tpAniSirGlobal pMac, static eCsrScanCompleteNextCommand csr_scan_get_next_command_state(
tSmeCmd *pCommand, tpAniSirGlobal pMac,
bool fSuccess, tSmeCmd *pCommand,
uint8_t *chan) bool fSuccess,
uint8_t *chan)
{ {
eCsrScanCompleteNextCommand NextCommand = eCsrNextScanNothing; eCsrScanCompleteNextCommand NextCommand = eCsrNextScanNothing;
int8_t channel; int8_t channel;
@@ -3831,7 +3836,7 @@ eCsrScanCompleteNextCommand csr_scan_get_next_command_state(tpAniSirGlobal pMac,
} }
/* Return whether the pCommand is finished. */ /* Return whether the pCommand is finished. */
bool csr_handle_scan11d1_failure(tpAniSirGlobal pMac, tSmeCmd *pCommand) static bool csr_handle_scan11d1_failure(tpAniSirGlobal pMac, tSmeCmd *pCommand)
{ {
bool fRet = true; bool fRet = true;
@@ -3930,8 +3935,8 @@ csr_diag_scan_complete(tpAniSirGlobal pMac,
* *
* Return: QDF_STATUS * Return: QDF_STATUS
*/ */
QDF_STATUS csr_save_profile(tpAniSirGlobal mac_ctx, static QDF_STATUS csr_save_profile(tpAniSirGlobal mac_ctx,
tSmeCmd *save_cmd, tSmeCmd *command) tSmeCmd *save_cmd, tSmeCmd *command)
{ {
tCsrScanResult *scan_result; tCsrScanResult *scan_result;
tCsrScanResult *temp; tCsrScanResult *temp;
@@ -4333,10 +4338,10 @@ csr_scan_remove_dup_bss_description_from_interim_list(tpAniSirGlobal mac_ctx,
/* Caller allocated memory pfNewBssForConn to return whether new candidate for */ /* Caller allocated memory pfNewBssForConn to return whether new candidate for */
/* current connection is found. Cannot be NULL */ /* current connection is found. Cannot be NULL */
tCsrScanResult *csr_scan_save_bss_description_to_interim_list(tpAniSirGlobal pMac, static tCsrScanResult *csr_scan_save_bss_description_to_interim_list(
tSirBssDescription * tpAniSirGlobal pMac,
pBSSDescription, tSirBssDescription *pBSSDescription,
tDot11fBeaconIEs *pIes) tDot11fBeaconIEs *pIes)
{ {
tCsrScanResult *pCsrBssDescription = NULL; tCsrScanResult *pCsrBssDescription = NULL;
uint32_t cbBSSDesc; uint32_t cbBSSDesc;
@@ -4674,7 +4679,7 @@ QDF_STATUS csr_scan_process_single_bssdescr(tpAniSirGlobal mac_ctx,
} }
bool csr_scan_is_wild_card_scan(tpAniSirGlobal pMac, tSmeCmd *pCommand) static bool csr_scan_is_wild_card_scan(tpAniSirGlobal pMac, tSmeCmd *pCommand)
{ {
uint8_t bssid[QDF_MAC_ADDR_SIZE] = {0}; uint8_t bssid[QDF_MAC_ADDR_SIZE] = {0};
/* /*
@@ -4847,7 +4852,7 @@ QDF_STATUS csr_move_bss_to_head_from_bssid(tpAniSirGlobal pMac,
/* Remove the BSS if possible. */ /* Remove the BSS if possible. */
/* Return -- true == the BSS is remove. False == Fail to remove it */ /* Return -- true == the BSS is remove. False == Fail to remove it */
/* This function is called when list lock is held. Be caution what functions it can call. */ /* This function is called when list lock is held. Be caution what functions it can call. */
bool csr_scan_age_out_bss(tpAniSirGlobal pMac, tCsrScanResult *pResult) static bool csr_scan_age_out_bss(tpAniSirGlobal pMac, tCsrScanResult *pResult)
{ {
bool fRet = false; bool fRet = false;
uint32_t i; uint32_t i;
@@ -4949,9 +4954,9 @@ QDF_STATUS csr_scan_age_results(tpAniSirGlobal pMac,
return status; return status;
} }
QDF_STATUS csr_send_mb_scan_req(tpAniSirGlobal pMac, uint16_t sessionId, static QDF_STATUS csr_send_mb_scan_req(tpAniSirGlobal pMac, uint16_t sessionId,
tCsrScanRequest *pScanReq, tCsrScanRequest *pScanReq,
tScanReqParam *pScanReqParam) tScanReqParam *pScanReqParam)
{ {
QDF_STATUS status = QDF_STATUS_SUCCESS; QDF_STATUS status = QDF_STATUS_SUCCESS;
tSirSmeScanReq *pMsg; tSirSmeScanReq *pMsg;