Merge "qcacld-3.0: Fix an htt memory leak" into wlan-cld3.driver.lnx.2.0-dev
diff --git a/core/dp/htt/htt.c b/core/dp/htt/htt.c
index eab4481..9c27922 100644
--- a/core/dp/htt/htt.c
+++ b/core/dp/htt/htt.c
@@ -118,6 +118,34 @@
}
#ifdef ATH_11AC_TXCOMPACT
+
+void
+htt_htc_misc_pkt_list_trim(struct htt_pdev_t *pdev, int level)
+{
+ struct htt_htc_pkt_union *pkt, *next, *prev = NULL;
+ int i = 0;
+ qdf_nbuf_t netbuf;
+
+ HTT_TX_MUTEX_ACQUIRE(&pdev->htt_tx_mutex);
+ pkt = pdev->htt_htc_pkt_misclist;
+ while (pkt) {
+ next = pkt->u.next;
+ /* trim the out grown list*/
+ if (++i > level) {
+ netbuf = (qdf_nbuf_t)(pkt->u.pkt.htc_pkt.pNetBufContext);
+ qdf_nbuf_unmap(pdev->osdev, netbuf, QDF_DMA_TO_DEVICE);
+ qdf_nbuf_free(netbuf);
+ qdf_mem_free(pkt);
+ pkt = NULL;
+ if (prev)
+ prev->u.next = NULL;
+ }
+ prev = pkt;
+ pkt = next;
+ }
+ HTT_TX_MUTEX_RELEASE(&pdev->htt_tx_mutex);
+}
+
void htt_htc_misc_pkt_list_add(struct htt_pdev_t *pdev, struct htt_htc_pkt *pkt)
{
struct htt_htc_pkt_union *u_pkt = (struct htt_htc_pkt_union *)pkt;
@@ -130,6 +158,8 @@
pdev->htt_htc_pkt_misclist = u_pkt;
}
HTT_TX_MUTEX_RELEASE(&pdev->htt_tx_mutex);
+
+ htt_htc_misc_pkt_list_trim(pdev, HTT_HTC_PKT_MISCLIST_SIZE);
}
void htt_htc_misc_pkt_pool_free(struct htt_pdev_t *pdev)
diff --git a/core/dp/htt/htt_internal.h b/core/dp/htt/htt_internal.h
index f53ec8a..c12bb5c 100644
--- a/core/dp/htt/htt_internal.h
+++ b/core/dp/htt/htt_internal.h
@@ -506,6 +506,8 @@
void htt_htc_pkt_pool_free(struct htt_pdev_t *pdev);
#ifdef ATH_11AC_TXCOMPACT
+void htt_htc_misc_pkt_list_trim(struct htt_pdev_t *pdev, int level);
+
void
htt_htc_misc_pkt_list_add(struct htt_pdev_t *pdev, struct htt_htc_pkt *pkt);
diff --git a/core/dp/htt/htt_types.h b/core/dp/htt/htt_types.h
index 035b510..e36eaf3 100644
--- a/core/dp/htt/htt_types.h
+++ b/core/dp/htt/htt_types.h
@@ -48,6 +48,7 @@
#endif
#endif /* QCA_TX_HTT2_SUPPORT */
+#define HTT_HTC_PKT_MISCLIST_SIZE 32
struct htt_htc_pkt {
void *pdev_ctxt;