qcacld-3.0: Remove unneeded csr_nonscan_pending_ll_remove_entry()

csr_nonscan_pending_ll_remove_entry() is not a correct API to
remove command from non-scan pending queue, it always return
false and fail to insert command to local list.

The correct API to remove an entry is csr_release_command(), no
need to check entry when insert to local list.
Remove the wrong API csr_nonscan_pending_ll_remove_entry().

Change-Id: I6c81f5d4ae57ceb6ebf2eec0a63859d0c1f12cb1
CRs-Fixed: 2308863
This commit is contained in:
Will Huang 2018-09-07 20:25:30 +08:00 • committed by nshrivas
commit 24d272baff
4 changed files with 7 additions and 28 deletions

View file

@ -1360,9 +1360,6 @@ bool csr_nonscan_pending_ll_is_list_empty(
bool csr_nonscan_active_ll_remove_entry(
struct sAniSirGlobal *mac_ctx,
tListElem *pEntryToRemove, bool inter_locked);
bool csr_nonscan_pending_ll_remove_entry(
struct sAniSirGlobal *mac_ctx,
tListElem *pEntryToRemove, bool inter_locked);
tListElem *csr_nonscan_active_ll_peek_head(
struct sAniSirGlobal *mac_ctx,
bool inter_locked);

View file

@ -4071,11 +4071,9 @@ static void csr_roam_remove_duplicate_pending_cmd_from_list(
!CSR_IS_DISCONNECT_COMMAND(dup_cmd))))) {
sme_debug("RoamReason: %d",
dup_cmd->u.roamCmd.roamReason);
/* Remove the roam command from the pending list */
if (csr_nonscan_pending_ll_remove_entry(mac_ctx,
entry, LL_ACCESS_NOLOCK))
csr_ll_insert_tail(&local_list, entry,
LL_ACCESS_NOLOCK);
/* Insert to local_list and remove later */
csr_ll_insert_tail(&local_list, entry,
LL_ACCESS_NOLOCK);
}
entry = next_entry;
}

View file

@ -1887,14 +1887,10 @@ QDF_STATUS csr_remove_nonscan_cmd_from_pending_list(tpAniSirGlobal pMac,
if ((pCommand->command == commandType) &&
(pCommand->sessionId == sessionId)) {
/* Remove that entry only */
if (csr_nonscan_pending_ll_remove_entry(pMac,
pEntryToRemove,
LL_ACCESS_NOLOCK)) {
csr_ll_insert_tail(&localList, pEntryToRemove,
LL_ACCESS_NOLOCK);
status = QDF_STATUS_SUCCESS;
}
/* Insert to localList and remove later */
csr_ll_insert_tail(&localList, pEntryToRemove,
LL_ACCESS_NOLOCK);
status = QDF_STATUS_SUCCESS;
}
}
csr_nonscan_pending_ll_unlock(pMac);

View file

@ -541,18 +541,6 @@ bool csr_nonscan_active_ll_remove_entry(struct sAniSirGlobal *mac_ctx,
return false;
}
bool csr_nonscan_pending_ll_remove_entry(struct sAniSirGlobal *mac_ctx,
tListElem *entry, bool inter_locked)
{
tListElem *head;
head = csr_nonscan_pending_ll_next(mac_ctx, entry, inter_locked);
if (head == entry)
return true;
return false;
}
tListElem *csr_nonscan_active_ll_remove_head(struct sAniSirGlobal *mac_ctx,
bool inter_locked)
{