Piteball
/
android_kernel_samsung_msm8976
mirror of https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

qcacld-2.0: Fix IBSS peer info handling when no peers are connected 

wma_ibss_peer_info_event_handler returns error when peer_info is NULL.
However, peer_info can be NULL in case num_peers connected is 0.
Handle this case in hdd_get_ibss_peer_info_cb so that callers of
GETIBSSPEERINFOALL do not see stale results after all connected peers
have left the IBSS. Also, log the errors for enabling debug and reset
the ibss_peer_info statistics.

CRs-Fixed: 1007555
Change-Id: I913748bf11f9362e5faaaf29c26fc39fda85f4a9
This commit is contained in:
Sriram, Madhvapathi 2016-04-25 16:47:53 +05:30 committed by L R
parent c43a594ff7
commit 17241f1b71
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/net/wireless/qcacld-2.0/CORE/HDD/src/wlan_hdd_main.c
View File

@ -1591,24 +1591,30 @@ hdd_get_ibss_peer_info_cb(v_VOID_t *pUserData,
}
pStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
if (NULL != pPeerInfo && eHAL_STATUS_SUCCESS == pPeerInfo->status) {
/* validate number of peers */
if (pPeerInfo->numPeers < HDD_MAX_NUM_IBSS_STA) {
pStaCtx->ibss_peer_info.status = pPeerInfo->status;
pStaCtx->ibss_peer_info.numPeers = pPeerInfo->numPeers;
for (i = 0; i < pPeerInfo->numPeers; i++) {
pStaCtx->ibss_peer_info.peerInfoParams[i] =
pPeerInfo->peerInfoParams[i];
}
hddLog(LOG1, FL("Peer Info copied in HDD"));
} else {
hddLog(LOG1,
FL("Number of peers %d returned is more than limit %d"),
if (pPeerInfo->numPeers > HDD_MAX_NUM_IBSS_STA) {
hddLog(LOGW,
FL("Limiting num_peers %u to %u"),
pPeerInfo->numPeers, HDD_MAX_NUM_IBSS_STA);
pPeerInfo->numPeers = HDD_MAX_NUM_IBSS_STA;
}
pStaCtx->ibss_peer_info.status = pPeerInfo->status;
pStaCtx->ibss_peer_info.numPeers = pPeerInfo->numPeers;
for (i = 0; i < pPeerInfo->numPeers; i++) {
pStaCtx->ibss_peer_info.peerInfoParams[i] =
pPeerInfo->peerInfoParams[i];
}
} else {
hddLog(LOG1, FL("peerInfo returned is NULL"));
hddLog(LOGE, FL("peerInfo %s: status %u, numPeers %u"),
pPeerInfo ? "valid" : "null",
pPeerInfo ? pPeerInfo->status : eHAL_STATUS_FAILURE,
pPeerInfo ? pPeerInfo->numPeers : 0);
pStaCtx->ibss_peer_info.numPeers = 0;
pStaCtx->ibss_peer_info.status = eHAL_STATUS_FAILURE;
}
complete(&pAdapter->ibss_peer_info_comp);