A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-11-10 04:42:22 -05:00
Code Issues Projects Releases Packages Wiki Activity

qcacmn: Check and then remove tx context from queue

Browse source 
It will remove the tx context firstly and then check whether need to
be deleted, which cause tx context memory leak. So, check the tx
context firstly, and then remove the tx context if need.

Change-Id: Icfe72318ccdd580002d269ffa8082b7f5fa4a341
CRs-Fixed: 2291867
This commit is contained in:
Wu Gao 2018-08-13 10:54:28 +08:00 • committed by nshrivas
commit 2b1d323609
1 changed files with 31 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

44
core/src/wlan_p2p_off_chan_tx.c
View file

@ -1704,6 +1704,7 @@ QDF_STATUS p2p_process_cleanup_tx_queue(struct p2p_cleanup_param *param)
qdf_list_node_t *p_node;
struct p2p_soc_priv_obj *p2p_soc_obj;
uint32_t vdev_id;
QDF_STATUS status, ret;
if (!param || !(param->p2p_soc_obj)) {
p2p_err("Invalid cleanup param");
@ -1713,34 +1714,51 @@ QDF_STATUS p2p_process_cleanup_tx_queue(struct p2p_cleanup_param *param)
p2p_soc_obj = param->p2p_soc_obj;
vdev_id = param->vdev_id;
p2p_debug("clean up tx queue wait for roc, size:%d",
qdf_list_size(&p2p_soc_obj->tx_q_roc));
p2p_debug("clean up tx queue wait for roc, size:%d, vdev_id:%d",
qdf_list_size(&p2p_soc_obj->tx_q_roc), vdev_id);
while (qdf_list_remove_front(&p2p_soc_obj->tx_q_roc, &p_node) ==
QDF_STATUS_SUCCESS) {
status = qdf_list_peek_front(&p2p_soc_obj->tx_q_roc, &p_node);
while (QDF_IS_STATUS_SUCCESS(status)) {
curr_tx_ctx = qdf_container_of(p_node,
struct tx_action_context, node);
if ((vdev_id == P2P_INVALID_VDEV_ID) ||
(vdev_id == curr_tx_ctx->vdev_id)) {
p2p_send_tx_conf(curr_tx_ctx, false);
qdf_mem_free(curr_tx_ctx->buf);
qdf_mem_free(curr_tx_ctx);
ret = qdf_list_remove_node(&p2p_soc_obj->tx_q_roc,
&curr_tx_ctx->node);
if (ret == QDF_STATUS_SUCCESS) {
p2p_send_tx_conf(curr_tx_ctx, false);
qdf_mem_free(curr_tx_ctx->buf);
qdf_mem_free(curr_tx_ctx);
} else
p2p_err("remove %pK from roc_q fail",
curr_tx_ctx);
}
status = qdf_list_peek_next(&p2p_soc_obj->tx_q_roc,
p_node, &p_node);
}
p2p_debug("clean up tx queue wait for ack, size:%d",
qdf_list_size(&p2p_soc_obj->tx_q_ack));
while (qdf_list_remove_front(&p2p_soc_obj->tx_q_ack, &p_node) ==
QDF_STATUS_SUCCESS) {
status = qdf_list_peek_front(&p2p_soc_obj->tx_q_ack, &p_node);
while (QDF_IS_STATUS_SUCCESS(status)) {
curr_tx_ctx = qdf_container_of(p_node,
struct tx_action_context, node);
if ((vdev_id == P2P_INVALID_VDEV_ID) ||
(vdev_id == curr_tx_ctx->vdev_id)) {
p2p_disable_tx_timer(curr_tx_ctx);
p2p_send_tx_conf(curr_tx_ctx, false);
qdf_mem_free(curr_tx_ctx->buf);
qdf_mem_free(curr_tx_ctx);
ret = qdf_list_remove_node(&p2p_soc_obj->tx_q_ack,
&curr_tx_ctx->node);
if (ret == QDF_STATUS_SUCCESS) {
p2p_disable_tx_timer(curr_tx_ctx);
p2p_send_tx_conf(curr_tx_ctx, false);
qdf_mem_free(curr_tx_ctx->buf);
qdf_mem_free(curr_tx_ctx);
} else
p2p_err("remove %pK from roc_q fail",
curr_tx_ctx);
}
status = qdf_list_peek_next(&p2p_soc_obj->tx_q_ack,
p_node, &p_node);
}
qdf_event_set(&p2p_soc_obj->cleanup_tx_done);